| 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 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #include "chrome/browser/chrome_notification_types.h" | 48 #include "chrome/browser/chrome_notification_types.h" |
| 49 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 49 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 50 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 50 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| 51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" | 51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" |
| 52 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 52 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
| 53 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h" | 53 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h" |
| 54 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 54 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 55 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 55 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
| 56 #include "chrome/browser/chromeos/login/login_wizard.h" | 56 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 57 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 57 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 58 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | |
| 59 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 58 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
| 60 #include "chrome/browser/chromeos/login/user_flow.h" | 59 #include "chrome/browser/chromeos/login/user_flow.h" |
| 61 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 60 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 62 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 61 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 63 #include "chrome/browser/chromeos/options/network_config_view.h" | 62 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 64 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 63 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 65 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 64 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 66 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" | 65 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" |
| 67 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 66 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 68 #include "chrome/browser/chromeos/set_time_dialog.h" | 67 #include "chrome/browser/chromeos/set_time_dialog.h" |
| (...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 return bluetooth_adapter_->IsPowered(); | 778 return bluetooth_adapter_->IsPowered(); |
| 780 } | 779 } |
| 781 | 780 |
| 782 bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() { | 781 bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() { |
| 783 return (bluetooth_discovery_session_.get() && | 782 return (bluetooth_discovery_session_.get() && |
| 784 bluetooth_discovery_session_->IsActive()); | 783 bluetooth_discovery_session_->IsActive()); |
| 785 } | 784 } |
| 786 | 785 |
| 787 void SystemTrayDelegateChromeOS::ChangeProxySettings() { | 786 void SystemTrayDelegateChromeOS::ChangeProxySettings() { |
| 788 CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE); | 787 CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE); |
| 789 LoginDisplayHostImpl::default_host()->OpenProxySettings(); | 788 LoginDisplayHost::default_host()->OpenProxySettings(); |
| 790 } | 789 } |
| 791 | 790 |
| 792 ash::CastConfigDelegate* SystemTrayDelegateChromeOS::GetCastConfigDelegate() { | 791 ash::CastConfigDelegate* SystemTrayDelegateChromeOS::GetCastConfigDelegate() { |
| 793 if (!cast_config_delegate_) | 792 if (!cast_config_delegate_) |
| 794 cast_config_delegate_ = CreateCastConfigDelegate(); | 793 cast_config_delegate_ = CreateCastConfigDelegate(); |
| 795 return cast_config_delegate_.get(); | 794 return cast_config_delegate_.get(); |
| 796 } | 795 } |
| 797 | 796 |
| 798 ash::NetworkingConfigDelegate* | 797 ash::NetworkingConfigDelegate* |
| 799 SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const { | 798 SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const { |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1330 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1329 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1331 << "ENABLE_SUPERVISED_USERS undefined."; | 1330 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1332 return base::string16(); | 1331 return base::string16(); |
| 1333 } | 1332 } |
| 1334 | 1333 |
| 1335 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1334 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1336 return new SystemTrayDelegateChromeOS(); | 1335 return new SystemTrayDelegateChromeOS(); |
| 1337 } | 1336 } |
| 1338 | 1337 |
| 1339 } // namespace chromeos | 1338 } // namespace chromeos |
| OLD | NEW |