OLD | NEW |
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 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <memory> | 10 #include <memory> |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "base/logging.h" | 26 #include "base/logging.h" |
27 #include "base/memory/ptr_util.h" | 27 #include "base/memory/ptr_util.h" |
28 #include "base/metrics/user_metrics.h" | 28 #include "base/metrics/user_metrics.h" |
29 #include "base/strings/utf_string_conversions.h" | 29 #include "base/strings/utf_string_conversions.h" |
30 #include "base/sys_info.h" | 30 #include "base/sys_info.h" |
31 #include "base/time/time.h" | 31 #include "base/time/time.h" |
32 #include "chrome/browser/browser_process.h" | 32 #include "chrome/browser/browser_process.h" |
33 #include "chrome/browser/chrome_notification_types.h" | 33 #include "chrome/browser/chrome_notification_types.h" |
34 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 34 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
35 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 35 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
36 #include "chrome/browser/chromeos/input_method/input_method_util.h" | |
37 #include "chrome/browser/chromeos/login/login_wizard.h" | 36 #include "chrome/browser/chromeos/login/login_wizard.h" |
38 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 37 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
39 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" | 38 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" |
40 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 39 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
41 #include "chrome/browser/profiles/profile_manager.h" | 40 #include "chrome/browser/profiles/profile_manager.h" |
42 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 41 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
43 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" | 42 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" |
44 #include "chrome/browser/ui/ash/system_tray_client.h" | 43 #include "chrome/browser/ui/ash/system_tray_client.h" |
45 #include "chrome/browser/ui/browser.h" | 44 #include "chrome/browser/ui/browser.h" |
46 #include "chrome/browser/ui/browser_list.h" | 45 #include "chrome/browser/ui/browser_list.h" |
47 #include "chrome/browser/ui/chrome_pages.h" | 46 #include "chrome/browser/ui/chrome_pages.h" |
48 #include "chrome/common/chrome_switches.h" | 47 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/features.h" | 48 #include "chrome/common/features.h" |
50 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
51 #include "chrome/grit/generated_resources.h" | 50 #include "chrome/grit/generated_resources.h" |
52 #include "chrome/grit/locale_settings.h" | 51 #include "chrome/grit/locale_settings.h" |
53 #include "chromeos/login/login_state.h" | 52 #include "chromeos/login/login_state.h" |
54 #include "chromeos/network/portal_detector/network_portal_detector.h" | 53 #include "chromeos/network/portal_detector/network_portal_detector.h" |
55 #include "components/google/core/browser/google_util.h" | 54 #include "components/google/core/browser/google_util.h" |
56 #include "components/prefs/pref_service.h" | 55 #include "components/prefs/pref_service.h" |
57 #include "components/session_manager/core/session_manager.h" | 56 #include "components/session_manager/core/session_manager.h" |
58 #include "components/user_manager/user.h" | 57 #include "components/user_manager/user.h" |
59 #include "components/user_manager/user_manager.h" | 58 #include "components/user_manager/user_manager.h" |
60 #include "components/user_manager/user_type.h" | 59 #include "components/user_manager/user_type.h" |
61 #include "content/public/browser/notification_observer.h" | 60 #include "content/public/browser/notification_observer.h" |
62 #include "content/public/browser/notification_service.h" | 61 #include "content/public/browser/notification_service.h" |
63 #include "ui/base/ime/chromeos/extension_ime_util.h" | 62 #include "ui/base/ime/chromeos/extension_ime_util.h" |
64 #include "ui/base/ime/chromeos/input_method_manager.h" | 63 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 64 #include "ui/base/ime/chromeos/input_method_util.h" |
65 #include "ui/base/l10n/l10n_util.h" | 65 #include "ui/base/l10n/l10n_util.h" |
66 #include "ui/base/l10n/time_format.h" | 66 #include "ui/base/l10n/time_format.h" |
67 #include "ui/chromeos/events/pref_names.h" | 67 #include "ui/chromeos/events/pref_names.h" |
68 #include "ui/chromeos/ime/input_method_menu_item.h" | 68 #include "ui/chromeos/ime/input_method_menu_item.h" |
69 #include "ui/chromeos/ime/input_method_menu_manager.h" | 69 #include "ui/chromeos/ime/input_method_menu_manager.h" |
70 | 70 |
71 namespace chromeos { | 71 namespace chromeos { |
72 | 72 |
73 namespace { | 73 namespace { |
74 | 74 |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 | 505 |
506 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged( | 506 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged( |
507 const std::string& engine_id, | 507 const std::string& engine_id, |
508 const std::vector<input_method::InputMethodManager::MenuItem>& items) {} | 508 const std::vector<input_method::InputMethodManager::MenuItem>& items) {} |
509 | 509 |
510 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 510 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
511 return new SystemTrayDelegateChromeOS(); | 511 return new SystemTrayDelegateChromeOS(); |
512 } | 512 } |
513 | 513 |
514 } // namespace chromeos | 514 } // namespace chromeos |
OLD | NEW |