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

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

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 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
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/session/session_state_observer.h" 10 #include "ash/session/session_state_observer.h"
11 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h" 11 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
12 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
14 #include "ash/system/tray/system_tray_notifier.h" 14 #include "ash/system/tray/system_tray_notifier.h"
15 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
16 #include "base/callback_list.h" 16 #include "base/callback_list.h"
17 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
18 #include "base/containers/scoped_ptr_hash_map.h" 18 #include "base/containers/scoped_ptr_hash_map.h"
19 #include "base/memory/ref_counted.h" 19 #include "base/memory/ref_counted.h"
20 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
21 #include "base/observer_list.h" 21 #include "base/observer_list.h"
22 #include "base/prefs/pref_change_registrar.h" 22 #include "base/prefs/pref_change_registrar.h"
23 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 23 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/supervised_user/supervised_user_service_observer.h" 25 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
26 #include "chrome/browser/ui/browser_list_observer.h" 26 #include "chrome/browser/ui/browser_list_observer.h"
27 #include "chromeos/audio/cras_audio_handler.h" 27 #include "chromeos/audio/cras_audio_handler.h"
28 #include "chromeos/dbus/session_manager_client.h" 28 #include "chromeos/dbus/session_manager_client.h"
29 #include "chromeos/ime/input_method_manager.h"
30 #include "chromeos/login/login_state.h" 29 #include "chromeos/login/login_state.h"
31 #include "components/policy/core/common/cloud/cloud_policy_store.h" 30 #include "components/policy/core/common/cloud/cloud_policy_store.h"
32 #include "components/user_manager/user_manager.h" 31 #include "components/user_manager/user_manager.h"
33 #include "content/public/browser/notification_observer.h" 32 #include "content/public/browser/notification_observer.h"
34 #include "content/public/browser/notification_registrar.h" 33 #include "content/public/browser/notification_registrar.h"
35 #include "device/bluetooth/bluetooth_adapter.h" 34 #include "device/bluetooth/bluetooth_adapter.h"
36 #include "device/bluetooth/bluetooth_discovery_session.h" 35 #include "device/bluetooth/bluetooth_discovery_session.h"
37 #include "extensions/browser/app_window/app_window_registry.h" 36 #include "extensions/browser/app_window/app_window_registry.h"
37 #include "ui/base/ime/chromeos/input_method_manager.h"
38 #include "ui/chromeos/ime/input_method_menu_manager.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 ui::ime::InputMethodMenuManager::Observer, 47 : public ui::ime::InputMethodMenuManager::Observer,
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 279 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
280 280
281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
282 }; 282 };
283 283
284 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 284 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
285 285
286 } // namespace chromeos 286 } // namespace chromeos
287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ime_controller_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698