| 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 "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
| 9 #include "ash/system/audio/audio_observer.h" | 9 #include "ash/system/audio/audio_observer.h" |
| 10 #include "ash/system/bluetooth/bluetooth_observer.h" | 10 #include "ash/system/bluetooth/bluetooth_observer.h" |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged, | 775 base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged, |
| 776 base::Unretained(this))); | 776 base::Unretained(this))); |
| 777 pref_registrar_->Add( | 777 pref_registrar_->Add( |
| 778 prefs::kShowLogoutButtonInTray, | 778 prefs::kShowLogoutButtonInTray, |
| 779 base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray, | 779 base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray, |
| 780 base::Unretained(this))); | 780 base::Unretained(this))); |
| 781 pref_registrar_->Add( | 781 pref_registrar_->Add( |
| 782 prefs::kMagnifierType, | 782 prefs::kMagnifierType, |
| 783 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, | 783 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, |
| 784 base::Unretained(this))); | 784 base::Unretained(this))); |
| 785 pref_registrar_->Add( |
| 786 prefs::kShouldAlwaysShowAccessibilityMenu, |
| 787 base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged, |
| 788 base::Unretained(this))); |
| 785 | 789 |
| 786 UpdateClockType(); | 790 UpdateClockType(); |
| 787 UpdateShowLogoutButtonInTray(); | 791 UpdateShowLogoutButtonInTray(); |
| 788 search_key_mapped_to_ = | 792 search_key_mapped_to_ = |
| 789 profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo); | 793 profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo); |
| 790 } | 794 } |
| 791 | 795 |
| 792 void ObserveGDataUpdates() { | 796 void ObserveGDataUpdates() { |
| 793 DriveSystemService* system_service = FindDriveSystemService(); | 797 DriveSystemService* system_service = FindDriveSystemService(); |
| 794 if (!system_service) | 798 if (!system_service) |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1285 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1289 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1286 }; | 1290 }; |
| 1287 | 1291 |
| 1288 } // namespace | 1292 } // namespace |
| 1289 | 1293 |
| 1290 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1294 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1291 return new chromeos::SystemTrayDelegate(); | 1295 return new chromeos::SystemTrayDelegate(); |
| 1292 } | 1296 } |
| 1293 | 1297 |
| 1294 } // namespace chromeos | 1298 } // namespace chromeos |
| OLD | NEW |