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 <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "ash/system/tray/system_tray_notifier.h" | 29 #include "ash/system/tray/system_tray_notifier.h" |
30 #include "ash/system/tray_accessibility.h" | 30 #include "ash/system/tray_accessibility.h" |
31 #include "ash/system/tray_caps_lock.h" | 31 #include "ash/system/tray_caps_lock.h" |
32 #include "ash/system/user/login_status.h" | 32 #include "ash/system/user/login_status.h" |
33 #include "ash/system/user/update_observer.h" | 33 #include "ash/system/user/update_observer.h" |
34 #include "ash/system/user/user_observer.h" | 34 #include "ash/system/user/user_observer.h" |
35 #include "ash/volume_control_delegate.h" | 35 #include "ash/volume_control_delegate.h" |
36 #include "ash/wm/lock_state_controller.h" | 36 #include "ash/wm/lock_state_controller.h" |
37 #include "base/bind_helpers.h" | 37 #include "base/bind_helpers.h" |
38 #include "base/callback.h" | 38 #include "base/callback.h" |
39 #include "base/command_line.h" | |
40 #include "base/logging.h" | 39 #include "base/logging.h" |
41 #include "base/memory/weak_ptr.h" | 40 #include "base/memory/weak_ptr.h" |
42 #include "base/prefs/pref_service.h" | 41 #include "base/prefs/pref_service.h" |
43 #include "base/strings/stringprintf.h" | 42 #include "base/strings/stringprintf.h" |
44 #include "base/strings/utf_string_conversions.h" | 43 #include "base/strings/utf_string_conversions.h" |
45 #include "base/sys_info.h" | 44 #include "base/sys_info.h" |
46 #include "base/time/time.h" | 45 #include "base/time/time.h" |
47 #include "chrome/browser/browser_process.h" | 46 #include "chrome/browser/browser_process.h" |
48 #include "chrome/browser/chrome_notification_types.h" | 47 #include "chrome/browser/chrome_notification_types.h" |
49 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 48 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "chrome/browser/ui/chrome_pages.h" | 83 #include "chrome/browser/ui/chrome_pages.h" |
85 #include "chrome/browser/ui/host_desktop.h" | 84 #include "chrome/browser/ui/host_desktop.h" |
86 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 85 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
87 #include "chrome/browser/ui/singleton_tabs.h" | 86 #include "chrome/browser/ui/singleton_tabs.h" |
88 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 87 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
89 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | 88 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" |
90 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 89 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
91 #include "chrome/browser/upgrade_detector.h" | 90 #include "chrome/browser/upgrade_detector.h" |
92 #include "chrome/common/pref_names.h" | 91 #include "chrome/common/pref_names.h" |
93 #include "chrome/common/url_constants.h" | 92 #include "chrome/common/url_constants.h" |
94 #include "chromeos/chromeos_switches.h" | |
95 #include "chromeos/dbus/dbus_thread_manager.h" | 93 #include "chromeos/dbus/dbus_thread_manager.h" |
96 #include "chromeos/dbus/session_manager_client.h" | 94 #include "chromeos/dbus/session_manager_client.h" |
97 #include "chromeos/ime/extension_ime_util.h" | 95 #include "chromeos/ime/extension_ime_util.h" |
98 #include "chromeos/ime/input_method_manager.h" | 96 #include "chromeos/ime/input_method_manager.h" |
99 #include "chromeos/ime/xkeyboard.h" | 97 #include "chromeos/ime/xkeyboard.h" |
100 #include "chromeos/login/login_state.h" | 98 #include "chromeos/login/login_state.h" |
101 #include "components/policy/core/common/cloud/cloud_policy_store.h" | 99 #include "components/policy/core/common/cloud/cloud_policy_store.h" |
102 #include "content/public/browser/notification_observer.h" | 100 #include "content/public/browser/notification_observer.h" |
103 #include "content/public/browser/notification_service.h" | 101 #include "content/public/browser/notification_service.h" |
104 #include "content/public/browser/user_metrics.h" | 102 #include "content/public/browser/user_metrics.h" |
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1187 return; | 1185 return; |
1188 bool value = user_pref_registrar_->prefs()->GetBoolean( | 1186 bool value = user_pref_registrar_->prefs()->GetBoolean( |
1189 prefs::kPerformanceTracingEnabled); | 1187 prefs::kPerformanceTracingEnabled); |
1190 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); | 1188 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); |
1191 } | 1189 } |
1192 | 1190 |
1193 // Overridden from InputMethodManager::Observer. | 1191 // Overridden from InputMethodManager::Observer. |
1194 void SystemTrayDelegateChromeOS::InputMethodChanged( | 1192 void SystemTrayDelegateChromeOS::InputMethodChanged( |
1195 input_method::InputMethodManager* manager, | 1193 input_method::InputMethodManager* manager, |
1196 bool show_message) { | 1194 bool show_message) { |
1197 // |show_message| in ash means the message_center notifications | 1195 GetSystemTrayNotifier()->NotifyRefreshIME(); |
1198 // which should not be shown unless kDisableIMEModeIndicator is | |
1199 // on, since the mode indicator already notifies the user. | |
1200 if (!CommandLine::ForCurrentProcess()->HasSwitch( | |
1201 switches::kDisableIMEModeIndicator)) { | |
1202 show_message = false; | |
1203 } | |
1204 GetSystemTrayNotifier()->NotifyRefreshIME(show_message); | |
1205 } | 1196 } |
1206 | 1197 |
1207 // Overridden from InputMethodMenuManager::Observer. | 1198 // Overridden from InputMethodMenuManager::Observer. |
1208 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( | 1199 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( |
1209 ash::ime::InputMethodMenuManager* manager) { | 1200 ash::ime::InputMethodMenuManager* manager) { |
1210 GetSystemTrayNotifier()->NotifyRefreshIME(false); | 1201 GetSystemTrayNotifier()->NotifyRefreshIME(); |
1211 } | 1202 } |
1212 | 1203 |
1213 // drive::JobListObserver overrides. | 1204 // drive::JobListObserver overrides. |
1214 void SystemTrayDelegateChromeOS::OnJobAdded(const drive::JobInfo& job_info) { | 1205 void SystemTrayDelegateChromeOS::OnJobAdded(const drive::JobInfo& job_info) { |
1215 OnJobUpdated(job_info); | 1206 OnJobUpdated(job_info); |
1216 } | 1207 } |
1217 | 1208 |
1218 void SystemTrayDelegateChromeOS::OnJobDone(const drive::JobInfo& job_info, | 1209 void SystemTrayDelegateChromeOS::OnJobDone(const drive::JobInfo& job_info, |
1219 drive::FileError error) { | 1210 drive::FileError error) { |
1220 ash::DriveOperationStatus status; | 1211 ash::DriveOperationStatus status; |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 void SystemTrayDelegateChromeOS::UserAddedToSession( | 1296 void SystemTrayDelegateChromeOS::UserAddedToSession( |
1306 const std::string& user_id) { | 1297 const std::string& user_id) { |
1307 GetSystemTrayNotifier()->NotifyUserAddedToSession(); | 1298 GetSystemTrayNotifier()->NotifyUserAddedToSession(); |
1308 } | 1299 } |
1309 | 1300 |
1310 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1301 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1311 return new SystemTrayDelegateChromeOS(); | 1302 return new SystemTrayDelegateChromeOS(); |
1312 } | 1303 } |
1313 | 1304 |
1314 } // namespace chromeos | 1305 } // namespace chromeos |
OLD | NEW |