Commit 191b339d authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Style cleanups following r606842.

BUG=898958
R=pkasting@chromium.org

Change-Id: Ib5790e607c4b0d500e39cfea7dd240596dee27ca
Reviewed-on: https://chromium-review.googlesource.com/c/1333372
Commit-Queue: Greg Thompson <grt@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609981}
parent d670fd60
...@@ -24,12 +24,12 @@ class AppMenuIconController : ...@@ -24,12 +24,12 @@ class AppMenuIconController :
public content::NotificationObserver, public content::NotificationObserver,
public UpgradeObserver { public UpgradeObserver {
public: public:
enum class IconType : uint32_t { enum class IconType {
NONE, NONE,
UPGRADE_NOTIFICATION, UPGRADE_NOTIFICATION,
GLOBAL_ERROR, GLOBAL_ERROR,
}; };
enum class Severity : uint32_t { enum class Severity {
NONE, NONE,
LOW, LOW,
MEDIUM, MEDIUM,
......
...@@ -45,10 +45,7 @@ ...@@ -45,10 +45,7 @@
bool BrowserAppMenuButton::g_open_app_immediately_for_testing = false; bool BrowserAppMenuButton::g_open_app_immediately_for_testing = false;
BrowserAppMenuButton::BrowserAppMenuButton(ToolbarView* toolbar_view) BrowserAppMenuButton::BrowserAppMenuButton(ToolbarView* toolbar_view)
: AppMenuButton(toolbar_view), : AppMenuButton(toolbar_view), toolbar_view_(toolbar_view) {
type_and_severity_{AppMenuIconController::IconType::NONE,
AppMenuIconController::Severity::NONE},
toolbar_view_(toolbar_view) {
SetInkDropMode(InkDropMode::ON); SetInkDropMode(InkDropMode::ON);
SetFocusPainter(nullptr); SetFocusPainter(nullptr);
SetHorizontalAlignment(gfx::ALIGN_CENTER); SetHorizontalAlignment(gfx::ALIGN_CENTER);
......
...@@ -78,7 +78,9 @@ class BrowserAppMenuButton : public AppMenuButton, ...@@ -78,7 +78,9 @@ class BrowserAppMenuButton : public AppMenuButton,
std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
const override; const override;
AppMenuIconController::TypeAndSeverity type_and_severity_; AppMenuIconController::TypeAndSeverity type_and_severity_{
AppMenuIconController::IconType::NONE,
AppMenuIconController::Severity::NONE};
// Our owning toolbar view. // Our owning toolbar view.
ToolbarView* const toolbar_view_; ToolbarView* const toolbar_view_;
......
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