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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h

Issue 11570017: Enables storing shelf's auto_hide_behavior and alignment per display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years 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/ash/launcher/chrome_launcher_controller_per_app.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
index b63f4f4706d6c7e5d3bab9dc397259afb2991fe2..72883553efc7763f6136d2cec203a97f9e46132f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
@@ -248,7 +248,7 @@ class ChromeLauncherControllerPerApp
const content::NotificationDetails& details) OVERRIDE;
// Overridden from ash::ShellObserver:
- virtual void OnShelfAlignmentChanged() OVERRIDE;
+ virtual void OnShelfAlignmentChanged(aura::RootWindow* root_window) OVERRIDE;
// Overridden from PrefServiceObserver:
virtual void OnIsSyncingChanged() OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698