Commit 8898d3c1 authored by edwardjung's avatar edwardjung Committed by Commit bot

Sad tab redesign for Windows, Linux and CrOS.

+ Update chrome://kill and chrome://crash icons. Both now use the same icon.
+ Make layout consistent with the SSL / Malware / net error set of interstitials.
+ Switched colours, margin, padding to use native UI constants.

BUG=457763

Review URL: https://codereview.chromium.org/1129513002

Cr-Commit-Position: refs/heads/master@{#330724}
parent 2f08ccf8
...@@ -433,7 +433,6 @@ ...@@ -433,7 +433,6 @@
<structure type="chrome_scaled_image" name="IDR_INPUT_ALERT_MENU" file="common/input_alert_menu.png" /> <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT_MENU" file="common/input_alert_menu.png" />
<structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="common/input_good.png" /> <structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="common/input_good.png" />
<structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="common/keyword_search_magnifier.png" /> <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="common/keyword_search_magnifier.png" />
<structure type="chrome_scaled_image" name="IDR_KILLED_TAB" file="common/killtab.png" />
<structure type="chrome_scaled_image" name="IDR_LAPTOP_FAVICON" file="common/favicon_laptop.png" /> <structure type="chrome_scaled_image" name="IDR_LAPTOP_FAVICON" file="common/favicon_laptop.png" />
<if expr="enable_service_discovery"> <if expr="enable_service_discovery">
<structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRINT_ICON" file="common/cloudprint.png" /> <structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRINT_ICON" file="common/cloudprint.png" />
......
This diff is collapsed.
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "chrome/browser/ui/sad_tab.h" #include "chrome/browser/ui/sad_tab.h"
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
#include "ui/views/controls/link_listener.h" #include "ui/views/controls/link_listener.h"
#include "ui/views/controls/styled_label.h"
#include "ui/views/controls/styled_label_listener.h"
#include "ui/views/view.h" #include "ui/views/view.h"
namespace content { namespace content {
...@@ -32,7 +34,8 @@ class LabelButton; ...@@ -32,7 +34,8 @@ class LabelButton;
class SadTabView : public chrome::SadTab, class SadTabView : public chrome::SadTab,
public views::View, public views::View,
public views::LinkListener, public views::LinkListener,
public views::ButtonListener { public views::ButtonListener,
public views::StyledLabelListener {
public: public:
SadTabView(content::WebContents* web_contents, chrome::SadTabKind kind); SadTabView(content::WebContents* web_contents, chrome::SadTabKind kind);
~SadTabView() override; ~SadTabView() override;
...@@ -55,8 +58,12 @@ class SadTabView : public chrome::SadTab, ...@@ -55,8 +58,12 @@ class SadTabView : public chrome::SadTab,
void Show() override; void Show() override;
void Close() override; void Close() override;
// views::StyledLabelListener methods.
void StyledLabelLinkClicked(const gfx::Range& range,
int event_flags) override;
views::Label* CreateLabel(const base::string16& text); views::Label* CreateLabel(const base::string16& text);
views::Link* CreateLink(const base::string16& text); views::Link* CreateLink(const base::string16& text, const SkColor& color);
content::WebContents* web_contents_; content::WebContents* web_contents_;
chrome::SadTabKind kind_; chrome::SadTabKind kind_;
...@@ -65,6 +72,8 @@ class SadTabView : public chrome::SadTab, ...@@ -65,6 +72,8 @@ class SadTabView : public chrome::SadTab,
views::Link* help_link_; views::Link* help_link_;
views::Link* feedback_link_; views::Link* feedback_link_;
views::LabelButton* reload_button_; views::LabelButton* reload_button_;
views::Label* title_;
views::StyledLabel* help_message_;
DISALLOW_COPY_AND_ASSIGN(SadTabView); DISALLOW_COPY_AND_ASSIGN(SadTabView);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment