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 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1226 if (!user_pref_registrar_) | 1226 if (!user_pref_registrar_) |
1227 return; | 1227 return; |
1228 bool value = user_pref_registrar_->prefs()->GetBoolean( | 1228 bool value = user_pref_registrar_->prefs()->GetBoolean( |
1229 prefs::kPerformanceTracingEnabled); | 1229 prefs::kPerformanceTracingEnabled); |
1230 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); | 1230 GetSystemTrayNotifier()->NotifyTracingModeChanged(value); |
1231 } | 1231 } |
1232 | 1232 |
1233 // Overridden from InputMethodManager::Observer. | 1233 // Overridden from InputMethodManager::Observer. |
1234 void SystemTrayDelegateChromeOS::InputMethodChanged( | 1234 void SystemTrayDelegateChromeOS::InputMethodChanged( |
1235 input_method::InputMethodManager* manager, | 1235 input_method::InputMethodManager* manager, |
| 1236 Profile* /* profile */, |
1236 bool show_message) { | 1237 bool show_message) { |
1237 GetSystemTrayNotifier()->NotifyRefreshIME(); | 1238 GetSystemTrayNotifier()->NotifyRefreshIME(); |
1238 } | 1239 } |
1239 | 1240 |
1240 // Overridden from InputMethodMenuManager::Observer. | 1241 // Overridden from InputMethodMenuManager::Observer. |
1241 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( | 1242 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( |
1242 ui::ime::InputMethodMenuManager* manager) { | 1243 ui::ime::InputMethodMenuManager* manager) { |
1243 GetSystemTrayNotifier()->NotifyRefreshIME(); | 1244 GetSystemTrayNotifier()->NotifyRefreshIME(); |
1244 } | 1245 } |
1245 | 1246 |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1418 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
1418 << "ENABLE_SUPERVISED_USERS undefined."; | 1419 << "ENABLE_SUPERVISED_USERS undefined."; |
1419 return base::string16(); | 1420 return base::string16(); |
1420 } | 1421 } |
1421 | 1422 |
1422 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1423 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1423 return new SystemTrayDelegateChromeOS(); | 1424 return new SystemTrayDelegateChromeOS(); |
1424 } | 1425 } |
1425 | 1426 |
1426 } // namespace chromeos | 1427 } // namespace chromeos |
OLD | NEW |