| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/system/ash_system_tray_delegate.h" | 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 base::Unretained(this))); | 922 base::Unretained(this))); |
| 923 user_pref_registrar_->Add( | 923 user_pref_registrar_->Add( |
| 924 prefs::kLanguageRemapSearchKeyTo, | 924 prefs::kLanguageRemapSearchKeyTo, |
| 925 base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged, | 925 base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged, |
| 926 base::Unretained(this))); | 926 base::Unretained(this))); |
| 927 user_pref_registrar_->Add( | 927 user_pref_registrar_->Add( |
| 928 prefs::kShowLogoutButtonInTray, | 928 prefs::kShowLogoutButtonInTray, |
| 929 base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray, | 929 base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray, |
| 930 base::Unretained(this))); | 930 base::Unretained(this))); |
| 931 user_pref_registrar_->Add( | 931 user_pref_registrar_->Add( |
| 932 prefs::kLargeCursorEnabled, |
| 933 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, |
| 934 base::Unretained(this), |
| 935 ash::A11Y_NOTIFICATION_NONE)); |
| 936 user_pref_registrar_->Add( |
| 932 prefs::kShouldAlwaysShowAccessibilityMenu, | 937 prefs::kShouldAlwaysShowAccessibilityMenu, |
| 933 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, | 938 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, |
| 934 base::Unretained(this), | 939 base::Unretained(this), |
| 935 ash::A11Y_NOTIFICATION_NONE)); | 940 ash::A11Y_NOTIFICATION_NONE)); |
| 936 | 941 |
| 937 UpdateClockType(); | 942 UpdateClockType(); |
| 938 UpdateShowLogoutButtonInTray(); | 943 UpdateShowLogoutButtonInTray(); |
| 939 search_key_mapped_to_ = | 944 search_key_mapped_to_ = |
| 940 profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo); | 945 profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo); |
| 941 } | 946 } |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1340 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1345 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1341 }; | 1346 }; |
| 1342 | 1347 |
| 1343 } // namespace | 1348 } // namespace |
| 1344 | 1349 |
| 1345 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1350 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1346 return new chromeos::SystemTrayDelegate(); | 1351 return new chromeos::SystemTrayDelegate(); |
| 1347 } | 1352 } |
| 1348 | 1353 |
| 1349 } // namespace chromeos | 1354 } // namespace chromeos |
| OLD | NEW |