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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h

Issue 11280115: Remove PrefObserver usages, batch 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix removal of PrefServiceObserver usage. 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>
11 11
12 #include "ash/launcher/launcher_delegate.h" 12 #include "ash/launcher/launcher_delegate.h"
13 #include "ash/launcher/launcher_model_observer.h" 13 #include "ash/launcher/launcher_model_observer.h"
14 #include "ash/launcher/launcher_types.h" 14 #include "ash/launcher/launcher_types.h"
15 #include "ash/shell_observer.h" 15 #include "ash/shell_observer.h"
16 #include "ash/wm/shelf_types.h" 16 #include "ash/wm/shelf_types.h"
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/prefs/public/pref_change_registrar.h" 20 #include "base/prefs/public/pref_change_registrar.h"
21 #include "base/prefs/public/pref_observer.h"
22 #include "chrome/browser/extensions/extension_prefs.h" 21 #include "chrome/browser/extensions/extension_prefs.h"
23 #include "chrome/browser/prefs/pref_service_observer.h" 22 #include "chrome/browser/prefs/pref_service_observer.h"
24 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" 23 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
25 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
26 #include "content/public/browser/notification_observer.h" 25 #include "content/public/browser/notification_observer.h"
27 #include "content/public/browser/notification_registrar.h" 26 #include "content/public/browser/notification_registrar.h"
28 #include "ui/aura/window_observer.h" 27 #include "ui/aura/window_observer.h"
29 28
30 class AppSyncUIState; 29 class AppSyncUIState;
31 class Browser; 30 class Browser;
(...skipping 22 matching lines...) Expand all
54 // * Tabbed browsers and browser app windows have BrowserLauncherItemController, 53 // * Tabbed browsers and browser app windows have BrowserLauncherItemController,
55 // owned by the BrowserView instance. 54 // owned by the BrowserView instance.
56 // * App shell windows have ShellWindowLauncherItemController, owned by 55 // * App shell windows have ShellWindowLauncherItemController, owned by
57 // ShellWindowLauncherController. 56 // ShellWindowLauncherController.
58 // * Shortcuts have no LauncherItemController. 57 // * Shortcuts have no LauncherItemController.
59 class ChromeLauncherControllerPerBrowser 58 class ChromeLauncherControllerPerBrowser
60 : public ash::LauncherModelObserver, 59 : public ash::LauncherModelObserver,
61 public ash::ShellObserver, 60 public ash::ShellObserver,
62 public ChromeLauncherController, 61 public ChromeLauncherController,
63 public content::NotificationObserver, 62 public content::NotificationObserver,
64 public PrefObserver,
65 public PrefServiceObserver, 63 public PrefServiceObserver,
66 public AppSyncUIStateObserver { 64 public AppSyncUIStateObserver {
67 public: 65 public:
68 ChromeLauncherControllerPerBrowser(Profile* profile, 66 ChromeLauncherControllerPerBrowser(Profile* profile,
69 ash::LauncherModel* model); 67 ash::LauncherModel* model);
70 virtual ~ChromeLauncherControllerPerBrowser(); 68 virtual ~ChromeLauncherControllerPerBrowser();
71 69
72 // ChromeLauncherController overrides: 70 // ChromeLauncherController overrides:
73 71
74 // Initializes this ChromeLauncherControllerPerBrowser. 72 // Initializes this ChromeLauncherControllerPerBrowser.
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE; 228 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE;
231 virtual void LauncherItemChanged(int index, 229 virtual void LauncherItemChanged(int index,
232 const ash::LauncherItem& old_item) OVERRIDE; 230 const ash::LauncherItem& old_item) OVERRIDE;
233 virtual void LauncherStatusChanged() OVERRIDE; 231 virtual void LauncherStatusChanged() OVERRIDE;
234 232
235 // Overridden from content::NotificationObserver: 233 // Overridden from content::NotificationObserver:
236 virtual void Observe(int type, 234 virtual void Observe(int type,
237 const content::NotificationSource& source, 235 const content::NotificationSource& source,
238 const content::NotificationDetails& details) OVERRIDE; 236 const content::NotificationDetails& details) OVERRIDE;
239 237
240 // Overridden from PrefObserver:
241 virtual void OnPreferenceChanged(PrefServiceBase* service,
242 const std::string& pref_name) OVERRIDE;
243
244 // Overridden from ash::ShellObserver: 238 // Overridden from ash::ShellObserver:
245 virtual void OnShelfAlignmentChanged() OVERRIDE; 239 virtual void OnShelfAlignmentChanged() OVERRIDE;
246 240
247 // Overridden from PrefServiceObserver: 241 // Overridden from PrefServiceObserver:
248 virtual void OnIsSyncingChanged() OVERRIDE; 242 virtual void OnIsSyncingChanged() OVERRIDE;
249 243
250 // Overridden from AppSyncUIStateObserver 244 // Overridden from AppSyncUIStateObserver
251 virtual void OnAppSyncUIStatusChanged() OVERRIDE; 245 virtual void OnAppSyncUIStatusChanged() OVERRIDE;
252 246
253 protected: 247 protected:
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 content::NotificationRegistrar notification_registrar_; 328 content::NotificationRegistrar notification_registrar_;
335 329
336 PrefChangeRegistrar pref_change_registrar_; 330 PrefChangeRegistrar pref_change_registrar_;
337 331
338 AppSyncUIState* app_sync_ui_state_; 332 AppSyncUIState* app_sync_ui_state_;
339 333
340 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser); 334 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);
341 }; 335 };
342 336
343 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_ 337 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698