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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 virtual void LauncherItemChanged(int index, 243 virtual void LauncherItemChanged(int index,
244 const ash::LauncherItem& old_item) OVERRIDE; 244 const ash::LauncherItem& old_item) OVERRIDE;
245 virtual void LauncherStatusChanged() OVERRIDE; 245 virtual void LauncherStatusChanged() OVERRIDE;
246 246
247 // Overridden from content::NotificationObserver: 247 // Overridden from content::NotificationObserver:
248 virtual void Observe(int type, 248 virtual void Observe(int type,
249 const content::NotificationSource& source, 249 const content::NotificationSource& source,
250 const content::NotificationDetails& details) OVERRIDE; 250 const content::NotificationDetails& details) OVERRIDE;
251 251
252 // Overridden from ash::ShellObserver: 252 // Overridden from ash::ShellObserver:
253 virtual void OnShelfAlignmentChanged() OVERRIDE; 253 virtual void OnShelfAlignmentChanged(aura::RootWindow* root_window) OVERRIDE;
254 254
255 // Overridden from PrefServiceObserver: 255 // Overridden from PrefServiceObserver:
256 virtual void OnIsSyncingChanged() OVERRIDE; 256 virtual void OnIsSyncingChanged() OVERRIDE;
257 257
258 // Overridden from AppSyncUIStateObserver 258 // Overridden from AppSyncUIStateObserver
259 virtual void OnAppSyncUIStatusChanged() OVERRIDE; 259 virtual void OnAppSyncUIStatusChanged() OVERRIDE;
260 260
261 protected: 261 protected:
262 // ChromeLauncherController overrides: 262 // ChromeLauncherController overrides:
263 263
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 content::NotificationRegistrar notification_registrar_; 346 content::NotificationRegistrar notification_registrar_;
347 347
348 PrefChangeRegistrar pref_change_registrar_; 348 PrefChangeRegistrar pref_change_registrar_;
349 349
350 AppSyncUIState* app_sync_ui_state_; 350 AppSyncUIState* app_sync_ui_state_;
351 351
352 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser); 352 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);
353 }; 353 };
354 354
355 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_ 355 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698