Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 673713003: Create a NetworkConnect class and Delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More virtual fixes Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 29 matching lines...) Expand all
40 #include "base/strings/stringprintf.h" 40 #include "base/strings/stringprintf.h"
41 #include "base/strings/utf_string_conversions.h" 41 #include "base/strings/utf_string_conversions.h"
42 #include "base/sys_info.h" 42 #include "base/sys_info.h"
43 #include "base/time/time.h" 43 #include "base/time/time.h"
44 #include "chrome/browser/browser_process.h" 44 #include "chrome/browser/browser_process.h"
45 #include "chrome/browser/chrome_notification_types.h" 45 #include "chrome/browser/chrome_notification_types.h"
46 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 46 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
48 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 48 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
49 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h" 49 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h"
50 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
51 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 50 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
52 #include "chrome/browser/chromeos/input_method/input_method_util.h" 51 #include "chrome/browser/chromeos/input_method/input_method_util.h"
53 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 52 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
54 #include "chrome/browser/chromeos/login/help_app_launcher.h" 53 #include "chrome/browser/chromeos/login/help_app_launcher.h"
55 #include "chrome/browser/chromeos/login/login_wizard.h" 54 #include "chrome/browser/chromeos/login/login_wizard.h"
56 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
57 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 56 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
58 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 57 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
59 #include "chrome/browser/chromeos/login/user_flow.h" 58 #include "chrome/browser/chromeos/login/user_flow.h"
60 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
61 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 60 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
62 #include "chrome/browser/chromeos/options/network_config_view.h" 61 #include "chrome/browser/chromeos/options/network_config_view.h"
63 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 62 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
64 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 63 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
65 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" 64 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
66 #include "chrome/browser/chromeos/profiles/profile_helper.h" 65 #include "chrome/browser/chromeos/profiles/profile_helper.h"
67 #include "chrome/browser/chromeos/set_time_dialog.h" 66 #include "chrome/browser/chromeos/set_time_dialog.h"
68 #include "chrome/browser/chromeos/settings/cros_settings.h" 67 #include "chrome/browser/chromeos/settings/cros_settings.h"
69 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
70 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" 68 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
71 #include "chrome/browser/lifetime/application_lifetime.h" 69 #include "chrome/browser/lifetime/application_lifetime.h"
72 #include "chrome/browser/profiles/profile_manager.h" 70 #include "chrome/browser/profiles/profile_manager.h"
73 #include "chrome/browser/supervised_user/supervised_user_service.h" 71 #include "chrome/browser/supervised_user/supervised_user_service.h"
74 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 72 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
75 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 73 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
76 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h" 74 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
77 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h" 75 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h"
78 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 76 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
79 #include "chrome/browser/ui/browser.h" 77 #include "chrome/browser/ui/browser.h"
80 #include "chrome/browser/ui/browser_finder.h" 78 #include "chrome/browser/ui/browser_finder.h"
81 #include "chrome/browser/ui/browser_list.h" 79 #include "chrome/browser/ui/browser_list.h"
82 #include "chrome/browser/ui/chrome_pages.h" 80 #include "chrome/browser/ui/chrome_pages.h"
83 #include "chrome/browser/ui/host_desktop.h" 81 #include "chrome/browser/ui/host_desktop.h"
84 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 82 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
85 #include "chrome/browser/ui/singleton_tabs.h" 83 #include "chrome/browser/ui/singleton_tabs.h"
86 #include "chrome/browser/ui/tabs/tab_strip_model.h" 84 #include "chrome/browser/ui/tabs/tab_strip_model.h"
87 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 85 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
88 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
89 #include "chrome/browser/upgrade_detector.h" 86 #include "chrome/browser/upgrade_detector.h"
90 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
91 #include "chrome/common/pref_names.h" 88 #include "chrome/common/pref_names.h"
92 #include "chrome/common/url_constants.h" 89 #include "chrome/common/url_constants.h"
93 #include "chrome/grit/generated_resources.h" 90 #include "chrome/grit/generated_resources.h"
94 #include "chrome/grit/locale_settings.h" 91 #include "chrome/grit/locale_settings.h"
95 #include "chromeos/dbus/dbus_thread_manager.h" 92 #include "chromeos/dbus/dbus_thread_manager.h"
96 #include "chromeos/dbus/session_manager_client.h" 93 #include "chromeos/dbus/session_manager_client.h"
97 #include "chromeos/ime/extension_ime_util.h" 94 #include "chromeos/ime/extension_ime_util.h"
98 #include "chromeos/ime/ime_keyboard.h" 95 #include "chromeos/ime/ime_keyboard.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) { 744 void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) {
748 input_method::InputMethodManager::Get() 745 input_method::InputMethodManager::Get()
749 ->GetActiveIMEState() 746 ->GetActiveIMEState()
750 ->ChangeInputMethod(ime_id, false /* show_message */); 747 ->ChangeInputMethod(ime_id, false /* show_message */);
751 } 748 }
752 749
753 void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) { 750 void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) {
754 input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key); 751 input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
755 } 752 }
756 753
757 void SystemTrayDelegateChromeOS::ShowNetworkConfigure(
758 const std::string& network_id) {
759 NetworkConfigView::Show(network_id, GetNativeWindow());
760 }
761
762 bool SystemTrayDelegateChromeOS::EnrollNetwork(
763 const std::string& network_id) {
764 return enrollment::CreateDialog(network_id, GetNativeWindow());
765 }
766
767 void SystemTrayDelegateChromeOS::ManageBluetoothDevices() { 754 void SystemTrayDelegateChromeOS::ManageBluetoothDevices() {
768 content::RecordAction(base::UserMetricsAction("ShowBluetoothSettingsPage")); 755 content::RecordAction(base::UserMetricsAction("ShowBluetoothSettingsPage"));
769 std::string sub_page = 756 std::string sub_page =
770 std::string(chrome::kSearchSubPage) + "#" + 757 std::string(chrome::kSearchSubPage) + "#" +
771 l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH); 758 l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
772 ShowSettingsSubPageForActiveUser(sub_page); 759 ShowSettingsSubPageForActiveUser(sub_page);
773 } 760 }
774 761
775 void SystemTrayDelegateChromeOS::ToggleBluetooth() { 762 void SystemTrayDelegateChromeOS::ToggleBluetooth() {
776 bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(), 763 bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
777 base::Bind(&base::DoNothing), 764 base::Bind(&base::DoNothing),
778 base::Bind(&BluetoothPowerFailure)); 765 base::Bind(&BluetoothPowerFailure));
779 } 766 }
780 767
781 void SystemTrayDelegateChromeOS::ShowMobileSimDialog() {
782 SimDialogDelegate::ShowDialog(GetNativeWindow(),
783 SimDialogDelegate::SIM_DIALOG_UNLOCK);
784 }
785
786 void SystemTrayDelegateChromeOS::ShowMobileSetupDialog(
787 const std::string& service_path) {
788 MobileSetupDialog::Show(service_path);
789 }
790
791 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog( 768 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog(
792 const std::string& type) { 769 const std::string& type) {
793 if (type == shill::kTypeCellular) { 770 if (type == shill::kTypeCellular) {
794 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow()); 771 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
795 return; 772 return;
796 } 773 }
797 NetworkConfigView::ShowForType(type, GetNativeWindow()); 774 NetworkConfigView::ShowForType(type, GetNativeWindow());
798 } 775 }
799 776
800 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() { 777 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 accessibility_subscription_.reset(); 1311 accessibility_subscription_.reset();
1335 else 1312 else
1336 OnAccessibilityModeChanged(details.notify); 1313 OnAccessibilityModeChanged(details.notify);
1337 } 1314 }
1338 1315
1339 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1316 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1340 return new SystemTrayDelegateChromeOS(); 1317 return new SystemTrayDelegateChromeOS();
1341 } 1318 }
1342 1319
1343 } // namespace chromeos 1320 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_delegate_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698