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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include "apps/app_window_registry.h"
9 #include "ash/ime/input_method_menu_manager.h" 8 #include "ash/ime/input_method_menu_manager.h"
10 #include "ash/session/session_state_observer.h" 9 #include "ash/session/session_state_observer.h"
11 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
12 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/system_tray_notifier.h" 12 #include "ash/system/tray/system_tray_notifier.h"
14 #include "base/callback_list.h" 13 #include "base/callback_list.h"
15 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
16 #include "base/containers/scoped_ptr_hash_map.h" 15 #include "base/containers/scoped_ptr_hash_map.h"
17 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
18 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
19 #include "base/prefs/pref_change_registrar.h" 18 #include "base/prefs/pref_change_registrar.h"
20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 21 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
23 #include "chrome/browser/ui/browser_list_observer.h" 22 #include "chrome/browser/ui/browser_list_observer.h"
24 #include "chromeos/audio/cras_audio_handler.h" 23 #include "chromeos/audio/cras_audio_handler.h"
25 #include "chromeos/dbus/session_manager_client.h" 24 #include "chromeos/dbus/session_manager_client.h"
26 #include "chromeos/ime/input_method_manager.h" 25 #include "chromeos/ime/input_method_manager.h"
27 #include "chromeos/login/login_state.h" 26 #include "chromeos/login/login_state.h"
28 #include "components/policy/core/common/cloud/cloud_policy_store.h" 27 #include "components/policy/core/common/cloud/cloud_policy_store.h"
29 #include "content/public/browser/notification_observer.h" 28 #include "content/public/browser/notification_observer.h"
30 #include "content/public/browser/notification_registrar.h" 29 #include "content/public/browser/notification_registrar.h"
31 #include "device/bluetooth/bluetooth_adapter.h" 30 #include "device/bluetooth/bluetooth_adapter.h"
32 #include "device/bluetooth/bluetooth_discovery_session.h" 31 #include "device/bluetooth/bluetooth_discovery_session.h"
32 #include "extensions/browser/app_window/app_window_registry.h"
33 33
34 namespace chromeos { 34 namespace chromeos {
35 35
36 class SystemTrayDelegateChromeOS 36 class SystemTrayDelegateChromeOS
37 : public ash::ime::InputMethodMenuManager::Observer, 37 : public ash::ime::InputMethodMenuManager::Observer,
38 public ash::SystemTrayDelegate, 38 public ash::SystemTrayDelegate,
39 public SessionManagerClient::Observer, 39 public SessionManagerClient::Observer,
40 public content::NotificationObserver, 40 public content::NotificationObserver,
41 public input_method::InputMethodManager::Observer, 41 public input_method::InputMethodManager::Observer,
42 public chromeos::LoginState::Observer, 42 public chromeos::LoginState::Observer,
43 public chromeos::CrasAudioHandler::AudioObserver, 43 public chromeos::CrasAudioHandler::AudioObserver,
44 public device::BluetoothAdapter::Observer, 44 public device::BluetoothAdapter::Observer,
45 public policy::CloudPolicyStore::Observer, 45 public policy::CloudPolicyStore::Observer,
46 public ash::SessionStateObserver, 46 public ash::SessionStateObserver,
47 public chrome::BrowserListObserver, 47 public chrome::BrowserListObserver,
48 public apps::AppWindowRegistry::Observer { 48 public extensions::AppWindowRegistry::Observer {
49 public: 49 public:
50 SystemTrayDelegateChromeOS(); 50 SystemTrayDelegateChromeOS();
51 51
52 virtual ~SystemTrayDelegateChromeOS(); 52 virtual ~SystemTrayDelegateChromeOS();
53 53
54 void InitializeOnAdapterReady( 54 void InitializeOnAdapterReady(
55 scoped_refptr<device::BluetoothAdapter> adapter); 55 scoped_refptr<device::BluetoothAdapter> adapter);
56 56
57 // Overridden from ash::SystemTrayDelegate: 57 // Overridden from ash::SystemTrayDelegate:
58 virtual void Initialize() OVERRIDE; 58 virtual void Initialize() OVERRIDE;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 // Overridden from CloudPolicyStore::Observer 222 // Overridden from CloudPolicyStore::Observer
223 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE; 223 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE;
224 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE; 224 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE;
225 225
226 // Overridden from ash::SessionStateObserver 226 // Overridden from ash::SessionStateObserver
227 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE; 227 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
228 228
229 // Overridden from chrome::BrowserListObserver: 229 // Overridden from chrome::BrowserListObserver:
230 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; 230 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
231 231
232 // Overridden from apps::AppWindowRegistry::Observer: 232 // Overridden from extensions::AppWindowRegistry::Observer:
233 virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE; 233 virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
234 234
235 void OnAccessibilityStatusChanged( 235 void OnAccessibilityStatusChanged(
236 const AccessibilityStatusEventDetails& details); 236 const AccessibilityStatusEventDetails& details);
237 237
238 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 238 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
239 scoped_ptr<content::NotificationRegistrar> registrar_; 239 scoped_ptr<content::NotificationRegistrar> registrar_;
240 scoped_ptr<PrefChangeRegistrar> local_state_registrar_; 240 scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
241 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 241 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
242 Profile* user_profile_; 242 Profile* user_profile_;
243 base::HourClockType clock_type_; 243 base::HourClockType clock_type_;
(...skipping 14 matching lines...) Expand all
258 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> 258 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
259 accounts_delegates_; 259 accounts_delegates_;
260 260
261 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 261 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
262 }; 262 };
263 263
264 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 264 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
265 265
266 } // namespace chromeos 266 } // namespace chromeos
267 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 267 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698