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

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

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: Created 6 years, 1 month 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
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 <vector> 8 #include <vector>
9 9
10 #include "ash/ime/input_method_menu_manager.h"
11 #include "ash/session/session_state_observer.h" 10 #include "ash/session/session_state_observer.h"
12 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h" 11 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
13 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
15 #include "ash/system/tray/system_tray_notifier.h" 14 #include "ash/system/tray/system_tray_notifier.h"
16 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
17 #include "base/callback_list.h" 16 #include "base/callback_list.h"
18 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
19 #include "base/containers/scoped_ptr_hash_map.h" 18 #include "base/containers/scoped_ptr_hash_map.h"
20 #include "base/memory/ref_counted.h" 19 #include "base/memory/ref_counted.h"
21 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
22 #include "base/observer_list.h" 21 #include "base/observer_list.h"
23 #include "base/prefs/pref_change_registrar.h" 22 #include "base/prefs/pref_change_registrar.h"
24 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 23 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
25 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/supervised_user/supervised_user_service_observer.h" 25 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
27 #include "chrome/browser/ui/browser_list_observer.h" 26 #include "chrome/browser/ui/browser_list_observer.h"
28 #include "chromeos/audio/cras_audio_handler.h" 27 #include "chromeos/audio/cras_audio_handler.h"
29 #include "chromeos/dbus/session_manager_client.h" 28 #include "chromeos/dbus/session_manager_client.h"
30 #include "chromeos/ime/input_method_manager.h" 29 #include "chromeos/ime/input_method_manager.h"
31 #include "chromeos/login/login_state.h" 30 #include "chromeos/login/login_state.h"
32 #include "components/policy/core/common/cloud/cloud_policy_store.h" 31 #include "components/policy/core/common/cloud/cloud_policy_store.h"
33 #include "components/user_manager/user_manager.h" 32 #include "components/user_manager/user_manager.h"
34 #include "content/public/browser/notification_observer.h" 33 #include "content/public/browser/notification_observer.h"
35 #include "content/public/browser/notification_registrar.h" 34 #include "content/public/browser/notification_registrar.h"
36 #include "device/bluetooth/bluetooth_adapter.h" 35 #include "device/bluetooth/bluetooth_adapter.h"
37 #include "device/bluetooth/bluetooth_discovery_session.h" 36 #include "device/bluetooth/bluetooth_discovery_session.h"
38 #include "extensions/browser/app_window/app_window_registry.h" 37 #include "extensions/browser/app_window/app_window_registry.h"
38 #include "ui/chromeos/ime/input_method_menu_manager.h"
39 39
40 namespace user_manager { 40 namespace user_manager {
41 class User; 41 class User;
42 } 42 }
43 43
44 namespace chromeos { 44 namespace chromeos {
45 45
46 class SystemTrayDelegateChromeOS 46 class SystemTrayDelegateChromeOS
47 : public ash::ime::InputMethodMenuManager::Observer, 47 : public ui::ime::InputMethodMenuManager::Observer,
48 public ash::SystemTrayDelegate, 48 public ash::SystemTrayDelegate,
49 public SessionManagerClient::Observer, 49 public SessionManagerClient::Observer,
50 public content::NotificationObserver, 50 public content::NotificationObserver,
51 public input_method::InputMethodManager::Observer, 51 public input_method::InputMethodManager::Observer,
52 public chromeos::LoginState::Observer, 52 public chromeos::LoginState::Observer,
53 public chromeos::CrasAudioHandler::AudioObserver, 53 public chromeos::CrasAudioHandler::AudioObserver,
54 public device::BluetoothAdapter::Observer, 54 public device::BluetoothAdapter::Observer,
55 public policy::CloudPolicyStore::Observer, 55 public policy::CloudPolicyStore::Observer,
56 public ash::SessionStateObserver, 56 public ash::SessionStateObserver,
57 public chrome::BrowserListObserver, 57 public chrome::BrowserListObserver,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ui::AccessibilityNotificationVisibility notify); 197 ui::AccessibilityNotificationVisibility notify);
198 198
199 void UpdatePerformanceTracing(); 199 void UpdatePerformanceTracing();
200 200
201 // Overridden from InputMethodManager::Observer. 201 // Overridden from InputMethodManager::Observer.
202 void InputMethodChanged(input_method::InputMethodManager* manager, 202 void InputMethodChanged(input_method::InputMethodManager* manager,
203 bool show_message) override; 203 bool show_message) override;
204 204
205 // Overridden from InputMethodMenuManager::Observer. 205 // Overridden from InputMethodMenuManager::Observer.
206 void InputMethodMenuItemChanged( 206 void InputMethodMenuItemChanged(
207 ash::ime::InputMethodMenuManager* manager) override; 207 ui::ime::InputMethodMenuManager* manager) override;
208 208
209 // Overridden from CrasAudioHandler::AudioObserver. 209 // Overridden from CrasAudioHandler::AudioObserver.
210 void OnOutputVolumeChanged() override; 210 void OnOutputVolumeChanged() override;
211 void OnOutputMuteChanged() override; 211 void OnOutputMuteChanged() override;
212 void OnInputGainChanged() override; 212 void OnInputGainChanged() override;
213 void OnInputMuteChanged() override; 213 void OnInputMuteChanged() override;
214 void OnAudioNodesChanged() override; 214 void OnAudioNodesChanged() override;
215 void OnActiveOutputNodeChanged() override; 215 void OnActiveOutputNodeChanged() override;
216 void OnActiveInputNodeChanged() override; 216 void OnActiveInputNodeChanged() override;
217 217
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 281
282 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 282 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
283 283
284 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 284 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
285 }; 285 };
286 286
287 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 287 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
288 288
289 } // namespace chromeos 289 } // namespace chromeos
290 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 290 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698