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 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1125 } | 1125 } |
1126 } | 1126 } |
1127 | 1127 |
1128 void SystemTrayDelegateChromeOS::OnLanguageRemapSearchKeyToChanged() { | 1128 void SystemTrayDelegateChromeOS::OnLanguageRemapSearchKeyToChanged() { |
1129 search_key_mapped_to_ = user_pref_registrar_->prefs()->GetInteger( | 1129 search_key_mapped_to_ = user_pref_registrar_->prefs()->GetInteger( |
1130 prefs::kLanguageRemapSearchKeyTo); | 1130 prefs::kLanguageRemapSearchKeyTo); |
1131 } | 1131 } |
1132 | 1132 |
1133 void SystemTrayDelegateChromeOS::OnAccessibilityModeChanged( | 1133 void SystemTrayDelegateChromeOS::OnAccessibilityModeChanged( |
1134 ui::AccessibilityNotificationVisibility notify) { | 1134 ui::AccessibilityNotificationVisibility notify) { |
1135 GetSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify); | 1135 GetWmSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify); |
1136 } | 1136 } |
1137 | 1137 |
1138 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() { | 1138 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() { |
1139 if (!user_pref_registrar_) | 1139 if (!user_pref_registrar_) |
1140 return; | 1140 return; |
1141 bool value = user_pref_registrar_->prefs()->GetBoolean( | 1141 bool value = user_pref_registrar_->prefs()->GetBoolean( |
1142 prefs::kPerformanceTracingEnabled); | 1142 prefs::kPerformanceTracingEnabled); |
1143 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); | 1143 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); |
1144 } | 1144 } |
1145 | 1145 |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1340 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1340 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
1341 << "ENABLE_SUPERVISED_USERS undefined."; | 1341 << "ENABLE_SUPERVISED_USERS undefined."; |
1342 return base::string16(); | 1342 return base::string16(); |
1343 } | 1343 } |
1344 | 1344 |
1345 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1345 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1346 return new SystemTrayDelegateChromeOS(); | 1346 return new SystemTrayDelegateChromeOS(); |
1347 } | 1347 } |
1348 | 1348 |
1349 } // namespace chromeos | 1349 } // namespace chromeos |
OLD | NEW |