| 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 <set> | 10 #include <set> |
| (...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1130 void SystemTrayDelegateChromeOS::OnAccessibilityModeChanged( | 1130 void SystemTrayDelegateChromeOS::OnAccessibilityModeChanged( |
| 1131 ash::AccessibilityNotificationVisibility notify) { | 1131 ash::AccessibilityNotificationVisibility notify) { |
| 1132 GetWmSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify); | 1132 GetWmSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify); |
| 1133 } | 1133 } |
| 1134 | 1134 |
| 1135 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() { | 1135 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() { |
| 1136 if (!user_pref_registrar_) | 1136 if (!user_pref_registrar_) |
| 1137 return; | 1137 return; |
| 1138 bool value = user_pref_registrar_->prefs()->GetBoolean( | 1138 bool value = user_pref_registrar_->prefs()->GetBoolean( |
| 1139 prefs::kPerformanceTracingEnabled); | 1139 prefs::kPerformanceTracingEnabled); |
| 1140 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); | 1140 GetWmSystemTrayNotifier()->NotifyTracingModeChanged(value); |
| 1141 } | 1141 } |
| 1142 | 1142 |
| 1143 // Overridden from InputMethodManager::Observer. | 1143 // Overridden from InputMethodManager::Observer. |
| 1144 void SystemTrayDelegateChromeOS::InputMethodChanged( | 1144 void SystemTrayDelegateChromeOS::InputMethodChanged( |
| 1145 input_method::InputMethodManager* manager, | 1145 input_method::InputMethodManager* manager, |
| 1146 Profile* /* profile */, | 1146 Profile* /* profile */, |
| 1147 bool show_message) { | 1147 bool show_message) { |
| 1148 GetWmSystemTrayNotifier()->NotifyRefreshIME(); | 1148 GetWmSystemTrayNotifier()->NotifyRefreshIME(); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1338 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1338 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1339 << "ENABLE_SUPERVISED_USERS undefined."; | 1339 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1340 return base::string16(); | 1340 return base::string16(); |
| 1341 } | 1341 } |
| 1342 | 1342 |
| 1343 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1343 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1344 return new SystemTrayDelegateChromeOS(); | 1344 return new SystemTrayDelegateChromeOS(); |
| 1345 } | 1345 } |
| 1346 | 1346 |
| 1347 } // namespace chromeos | 1347 } // namespace chromeos |
| OLD | NEW |