Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1060)

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 2374803002: Remove a bunch of pre-MD toolbar code and assets. (Closed)
Patch Set: fix mac? Created 4 years, 3 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
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 32e28585cba50df16b5ff4eb1c8957a53e207730..62ea18e22e865a2ceb7e115c858469492022f481 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -160,7 +160,7 @@ CGFloat BrowserActionsContainerDelegate::GetMaxAllowedWidth() {
- (void)browserActionsVisibilityChanged:(NSNotification*)notification;
- (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
- (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
-- (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
+- (void)updateAppMenuButtonSeverity:(AppMenuIconController::Severity)severity
iconType:(AppMenuIconController::IconType)iconType
animate:(BOOL)animate;
@end
@@ -204,7 +204,7 @@ class NotificationBridge : public AppMenuIconController::Delegate {
void UpdateSeverity() { app_menu_icon_controller_.UpdateDelegate(); }
void UpdateSeverity(AppMenuIconController::IconType type,
- AppMenuIconPainter::Severity severity,
+ AppMenuIconController::Severity severity,
bool animate) override {
[controller_ updateAppMenuButtonSeverity:severity
iconType:type
@@ -758,7 +758,7 @@ class NotificationBridge : public AppMenuIconController::Delegate {
[appMenuButton_ setAttachedMenu:[appMenuController_ menu]];
}
-- (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
+- (void)updateAppMenuButtonSeverity:(AppMenuIconController::Severity)severity
iconType:(AppMenuIconController::IconType)iconType
animate:(BOOL)animate {
AppToolbarButton* appMenuButton =

Powered by Google App Engine
This is Rietveld 408576698