chrome/browser/ui/views/toolbar/toolbar_view.h - Issue 2039403002: Renamed AppMenuBadgeController to AppMenuIconController

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 2039403002: Renamed AppMenuBadgeController to AppMenuIconController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reword comment Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu_button.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_view.h

diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h

index 122ea168ad6164a7637660289a3e53d2dafa6b04..082db67b9e2cd003d293e521574454c15dcdd326 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_view.h

+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h

@@ -10,7 +10,7 @@

#include "base/macros.h"

#include "base/observer_list.h"

#include "chrome/browser/command_observer.h"

-#include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"

+#include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"

#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"

#include "chrome/browser/ui/views/location_bar/location_bar_view.h"

#include "components/prefs/pref_member.h"

@@ -42,7 +42,7 @@ class ToolbarView : public views::AccessiblePaneView,

public CommandObserver,

public views::ButtonListener,

public views::ViewTargeterDelegate,

- public AppMenuBadgeController::Delegate {

+ public AppMenuIconController::Delegate {

public:

// The view class name.

static const char kViewClassName[];

@@ -96,8 +96,8 @@ class ToolbarView : public views::AccessiblePaneView,

LocationBarView* location_bar() const { return location_bar_; }

AppMenuButton* app_menu_button() const { return app_menu_button_; }

HomeButton* home_button() const { return home_; }

- AppMenuBadgeController* app_menu_badge_controller() {

- return &badge_controller_;

+ AppMenuIconController* app_menu_icon_controller() {

+ return &icon_controller_;

}

// AccessiblePaneView:

@@ -164,10 +164,10 @@ class ToolbarView : public views::AccessiblePaneView,

bool DoesIntersectRect(const views::View* target,

const gfx::Rect& rect) const override;

- // AppMenuBadgeController::Delegate:

- void UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,

- AppMenuIconPainter::Severity severity,

- bool animate) override;

+ // AppMenuIconController::Delegate:

+ void UpdateIconSeverity(AppMenuIconController::IconType type,

Evan Stade 2016/06/10 18:01:57 in cases like this I would go ahead and remove the

kylix_rd 2016/06/10 19:08:53 Done.

+ AppMenuIconPainter::Severity severity,

+ bool animate) override;

// Used to avoid duplicating the near-identical logic of

// ToolbarView::GetPreferredSize() and ToolbarView::GetMinimumSize(). These

@@ -208,7 +208,7 @@ class ToolbarView : public views::AccessiblePaneView,

Browser* browser_;

- AppMenuBadgeController badge_controller_;

+ AppMenuIconController icon_controller_;

Evan Stade 2016/06/10 18:01:57 can you rename to app_menu_icon_controller_? In th

kylix_rd 2016/06/10 19:08:53 Done.

// Controls whether or not a home button should be shown on the toolbar.

BooleanPrefMember show_home_button_;