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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 } | 901 } |
902 | 902 |
903 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { | 903 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { |
904 GetSystemTrayNotifier()->NotifyUserUpdate(); | 904 GetSystemTrayNotifier()->NotifyUserUpdate(); |
905 } | 905 } |
906 | 906 |
907 bool SystemTrayDelegateChromeOS::IsNetworkBehindCaptivePortal( | 907 bool SystemTrayDelegateChromeOS::IsNetworkBehindCaptivePortal( |
908 const std::string& service_path) const { | 908 const std::string& service_path) const { |
909 NetworkPortalDetector::CaptivePortalState state = | 909 NetworkPortalDetector::CaptivePortalState state = |
910 NetworkPortalDetector::Get()->GetCaptivePortalState(service_path); | 910 NetworkPortalDetector::Get()->GetCaptivePortalState(service_path); |
911 return state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL; | 911 return state.status == captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL; |
912 } | 912 } |
913 | 913 |
914 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { | 914 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { |
915 return search_key_mapped_to_ == input_method::kCapsLockKey; | 915 return search_key_mapped_to_ == input_method::kCapsLockKey; |
916 } | 916 } |
917 | 917 |
918 ash::tray::UserAccountsDelegate* | 918 ash::tray::UserAccountsDelegate* |
919 SystemTrayDelegateChromeOS::GetUserAccountsDelegate( | 919 SystemTrayDelegateChromeOS::GetUserAccountsDelegate( |
920 const std::string& user_id) { | 920 const std::string& user_id) { |
921 if (!accounts_delegates_.contains(user_id)) { | 921 if (!accounts_delegates_.contains(user_id)) { |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1419 accessibility_subscription_.reset(); | 1419 accessibility_subscription_.reset(); |
1420 else | 1420 else |
1421 OnAccessibilityModeChanged(details.notify); | 1421 OnAccessibilityModeChanged(details.notify); |
1422 } | 1422 } |
1423 | 1423 |
1424 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1424 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1425 return new SystemTrayDelegateChromeOS(); | 1425 return new SystemTrayDelegateChromeOS(); |
1426 } | 1426 } |
1427 | 1427 |
1428 } // namespace chromeos | 1428 } // namespace chromeos |
OLD | NEW |