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

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

Issue 169033003: try 3 of: Split out InputMethodMenuManager from InputMethodManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-uploaded with the fix Created 6 years, 10 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 "ash/ime/input_method_menu_manager.h"
8 #include "ash/session_state_observer.h" 9 #include "ash/session_state_observer.h"
9 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
10 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
11 #include "ash/system/tray/system_tray_notifier.h" 12 #include "ash/system/tray/system_tray_notifier.h"
12 #include "base/callback_list.h" 13 #include "base/callback_list.h"
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
16 #include "base/prefs/pref_change_registrar.h" 17 #include "base/prefs/pref_change_registrar.h"
17 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 18 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
18 #include "chrome/browser/chromeos/drive/job_list.h" 19 #include "chrome/browser/chromeos/drive/job_list.h"
19 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 20 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 22 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
22 #include "chromeos/dbus/session_manager_client.h" 23 #include "chromeos/dbus/session_manager_client.h"
23 #include "chromeos/ime/input_method_manager.h" 24 #include "chromeos/ime/input_method_manager.h"
24 #include "chromeos/login/login_state.h" 25 #include "chromeos/login/login_state.h"
25 #include "components/policy/core/common/cloud/cloud_policy_store.h" 26 #include "components/policy/core/common/cloud/cloud_policy_store.h"
26 #include "content/public/browser/notification_observer.h" 27 #include "content/public/browser/notification_observer.h"
27 #include "content/public/browser/notification_registrar.h" 28 #include "content/public/browser/notification_registrar.h"
28 #include "device/bluetooth/bluetooth_adapter.h" 29 #include "device/bluetooth/bluetooth_adapter.h"
29 30
30 namespace chromeos { 31 namespace chromeos {
31 32
32 class SystemTrayDelegateChromeOS 33 class SystemTrayDelegateChromeOS
33 : public ash::SystemTrayDelegate, 34 : public ash::ime::InputMethodMenuManager::Observer,
35 public ash::SystemTrayDelegate,
34 public SessionManagerClient::Observer, 36 public SessionManagerClient::Observer,
35 public drive::JobListObserver, 37 public drive::JobListObserver,
36 public content::NotificationObserver, 38 public content::NotificationObserver,
37 public input_method::InputMethodManager::Observer, 39 public input_method::InputMethodManager::Observer,
38 public chromeos::LoginState::Observer, 40 public chromeos::LoginState::Observer,
39 public device::BluetoothAdapter::Observer, 41 public device::BluetoothAdapter::Observer,
40 public SystemKeyEventListener::CapsLockObserver, 42 public SystemKeyEventListener::CapsLockObserver,
41 public policy::CloudPolicyStore::Observer, 43 public policy::CloudPolicyStore::Observer,
42 public ash::SessionStateObserver { 44 public ash::SessionStateObserver {
43 public: 45 public:
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 175
174 void OnAccessibilityModeChanged( 176 void OnAccessibilityModeChanged(
175 ash::AccessibilityNotificationVisibility notify); 177 ash::AccessibilityNotificationVisibility notify);
176 178
177 void UpdatePerformanceTracing(); 179 void UpdatePerformanceTracing();
178 180
179 // Overridden from InputMethodManager::Observer. 181 // Overridden from InputMethodManager::Observer.
180 virtual void InputMethodChanged(input_method::InputMethodManager* manager, 182 virtual void InputMethodChanged(input_method::InputMethodManager* manager,
181 bool show_message) OVERRIDE; 183 bool show_message) OVERRIDE;
182 184
183 virtual void InputMethodPropertyChanged( 185 // Overridden from InputMethodMenuManager::Observer.
184 input_method::InputMethodManager* manager) OVERRIDE; 186 virtual void InputMethodMenuItemChanged(
187 ash::ime::InputMethodMenuManager* manager) OVERRIDE;
185 188
186 // drive::JobListObserver overrides. 189 // drive::JobListObserver overrides.
187 virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE; 190 virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;
188 191
189 virtual void OnJobDone(const drive::JobInfo& job_info, 192 virtual void OnJobDone(const drive::JobInfo& job_info,
190 drive::FileError error) OVERRIDE; 193 drive::FileError error) OVERRIDE;
191 194
192 virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE; 195 virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE;
193 196
194 drive::DriveIntegrationService* FindDriveIntegrationService(); 197 drive::DriveIntegrationService* FindDriveIntegrationService();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 239 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
237 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 240 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
238 241
239 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 242 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
240 }; 243 };
241 244
242 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 245 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
243 246
244 } // namespace chromeos 247 } // namespace chromeos
245 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 248 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698