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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
48 #include "chrome/browser/chromeos/audio/audio_handler.h" | 48 #include "chrome/browser/chromeos/audio/audio_handler.h" |
49 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" | 49 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" |
50 #include "chrome/browser/chromeos/cros/cros_library.h" | 50 #include "chrome/browser/chromeos/cros/cros_library.h" |
51 #include "chrome/browser/chromeos/cros/network_library.h" | 51 #include "chrome/browser/chromeos/cros/network_library.h" |
52 #include "chrome/browser/chromeos/drive/drive_system_service.h" | 52 #include "chrome/browser/chromeos/drive/drive_system_service.h" |
53 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 53 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
54 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 54 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
55 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 55 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
57 #include "chrome/browser/chromeos/login/base_login_display_host.h" | |
58 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 57 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
59 #include "chrome/browser/chromeos/login/login_display_host.h" | 58 #include "chrome/browser/chromeos/login/login_display_host.h" |
| 59 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
60 #include "chrome/browser/chromeos/login/login_wizard.h" | 60 #include "chrome/browser/chromeos/login/login_wizard.h" |
61 #include "chrome/browser/chromeos/login/user.h" | 61 #include "chrome/browser/chromeos/login/user.h" |
62 #include "chrome/browser/chromeos/login/user_manager.h" | 62 #include "chrome/browser/chromeos/login/user_manager.h" |
63 #include "chrome/browser/chromeos/login/wizard_controller.h" | 63 #include "chrome/browser/chromeos/login/wizard_controller.h" |
64 #include "chrome/browser/chromeos/mobile_config.h" | 64 #include "chrome/browser/chromeos/mobile_config.h" |
65 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 65 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
66 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 66 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
67 #include "chrome/browser/chromeos/status/network_menu.h" | 67 #include "chrome/browser/chromeos/status/network_menu.h" |
68 #include "chrome/browser/chromeos/status/network_menu_icon.h" | 68 #include "chrome/browser/chromeos/status/network_menu_icon.h" |
69 #include "chrome/browser/chromeos/system/timezone_settings.h" | 69 #include "chrome/browser/chromeos/system/timezone_settings.h" |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
950 virtual bool GetCellularInitializing() OVERRIDE { | 950 virtual bool GetCellularInitializing() OVERRIDE { |
951 return CrosLibrary::Get()->GetNetworkLibrary()->cellular_initializing(); | 951 return CrosLibrary::Get()->GetNetworkLibrary()->cellular_initializing(); |
952 } | 952 } |
953 | 953 |
954 virtual void ShowCellularURL(const std::string& url) OVERRIDE { | 954 virtual void ShowCellularURL(const std::string& url) OVERRIDE { |
955 chrome::ShowSingletonTab(GetAppropriateBrowser(), GURL(url)); | 955 chrome::ShowSingletonTab(GetAppropriateBrowser(), GURL(url)); |
956 } | 956 } |
957 | 957 |
958 virtual void ChangeProxySettings() OVERRIDE { | 958 virtual void ChangeProxySettings() OVERRIDE { |
959 CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE); | 959 CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE); |
960 BaseLoginDisplayHost::default_host()->OpenProxySettings(); | 960 LoginDisplayHostImpl::default_host()->OpenProxySettings(); |
961 } | 961 } |
962 | 962 |
963 virtual ash::VolumeControlDelegate* | 963 virtual ash::VolumeControlDelegate* |
964 GetVolumeControlDelegate() const OVERRIDE { | 964 GetVolumeControlDelegate() const OVERRIDE { |
965 return volume_control_delegate_.get(); | 965 return volume_control_delegate_.get(); |
966 } | 966 } |
967 | 967 |
968 virtual void SetVolumeControlDelegate( | 968 virtual void SetVolumeControlDelegate( |
969 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE { | 969 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE { |
970 volume_control_delegate_.swap(delegate); | 970 volume_control_delegate_.swap(delegate); |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1583 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1583 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1584 }; | 1584 }; |
1585 | 1585 |
1586 } // namespace | 1586 } // namespace |
1587 | 1587 |
1588 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1588 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1589 return new chromeos::SystemTrayDelegate(); | 1589 return new chromeos::SystemTrayDelegate(); |
1590 } | 1590 } |
1591 | 1591 |
1592 } // namespace chromeos | 1592 } // namespace chromeos |
OLD | NEW |