OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_client.h" | 5 #include "chrome/browser/ui/ash/system_tray_client.h" |
6 | 6 |
7 #include "ash/login_status.h" | 7 #include "ash/login_status.h" |
8 #include "ash/public/cpp/shell_window_ids.h" | 8 #include "ash/public/cpp/shell_window_ids.h" |
9 #include "ash/public/interfaces/constants.mojom.h" | 9 #include "ash/public/interfaces/constants.mojom.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "base/feature_list.h" | |
12 #include "base/logging.h" | 11 #include "base/logging.h" |
13 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
14 #include "base/metrics/user_metrics.h" | 13 #include "base/metrics/user_metrics.h" |
15 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/browser_process_platform_part.h" | 15 #include "chrome/browser/browser_process_platform_part.h" |
17 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
18 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" | 17 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
19 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" | 18 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" |
20 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 19 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
21 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 20 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
22 #include "chrome/browser/chromeos/options/network_config_view.h" | 21 #include "chrome/browser/chromeos/options/network_config_view.h" |
23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
24 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 23 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
25 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 24 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
26 #include "chrome/browser/chromeos/set_time_dialog.h" | 25 #include "chrome/browser/chromeos/set_time_dialog.h" |
27 #include "chrome/browser/chromeos/system/system_clock.h" | 26 #include "chrome/browser/chromeos/system/system_clock.h" |
28 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" | 27 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" |
29 #include "chrome/browser/lifetime/application_lifetime.h" | 28 #include "chrome/browser/lifetime/application_lifetime.h" |
30 #include "chrome/browser/lifetime/termination_notification.h" | 29 #include "chrome/browser/lifetime/termination_notification.h" |
31 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
32 #include "chrome/browser/ui/ash/ash_util.h" | 31 #include "chrome/browser/ui/ash/ash_util.h" |
33 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 32 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
34 #include "chrome/browser/ui/chrome_pages.h" | 33 #include "chrome/browser/ui/chrome_pages.h" |
35 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 34 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
36 #include "chrome/browser/ui/singleton_tabs.h" | 35 #include "chrome/browser/ui/singleton_tabs.h" |
37 #include "chrome/browser/upgrade_detector.h" | 36 #include "chrome/browser/upgrade_detector.h" |
38 #include "chrome/common/chrome_features.h" | |
39 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
40 #include "chromeos/dbus/dbus_thread_manager.h" | 38 #include "chromeos/dbus/dbus_thread_manager.h" |
41 #include "chromeos/dbus/session_manager_client.h" | 39 #include "chromeos/dbus/session_manager_client.h" |
42 #include "chromeos/login/login_state.h" | 40 #include "chromeos/login/login_state.h" |
43 #include "chromeos/network/network_handler.h" | 41 #include "chromeos/network/network_handler.h" |
44 #include "chromeos/network/network_state.h" | 42 #include "chromeos/network/network_state.h" |
45 #include "chromeos/network/network_state_handler.h" | 43 #include "chromeos/network/network_state_handler.h" |
46 #include "chromeos/network/tether_constants.h" | 44 #include "chromeos/network/tether_constants.h" |
47 #include "components/session_manager/core/session_manager.h" | 45 #include "components/session_manager/core/session_manager.h" |
48 #include "components/user_manager/user_manager.h" | 46 #include "components/user_manager/user_manager.h" |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 | 406 |
409 void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id, | 407 void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id, |
410 bool show_configure) { | 408 bool show_configure) { |
411 if (!LoginState::Get()->IsUserLoggedIn() || | 409 if (!LoginState::Get()->IsUserLoggedIn() || |
412 session_manager::SessionManager::Get()->IsInSecondaryLoginScreen()) { | 410 session_manager::SessionManager::Get()->IsInSecondaryLoginScreen()) { |
413 return; | 411 return; |
414 } | 412 } |
415 | 413 |
416 std::string page = chrome::kInternetSubPage; | 414 std::string page = chrome::kInternetSubPage; |
417 if (!network_id.empty()) { | 415 if (!network_id.empty()) { |
418 if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) | 416 page = chrome::kNetworkDetailSubPage; |
419 page = chrome::kNetworkDetailSubPage; | 417 page += "?guid="; |
420 page += "?guid=" + net::EscapeUrlEncodedData(network_id, true); | 418 page += net::EscapeUrlEncodedData(network_id, true); |
421 if (show_configure) | 419 if (show_configure) |
422 page += "&showConfigure=true"; | 420 page += "&showConfigure=true"; |
423 } | 421 } |
424 base::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog")); | 422 base::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog")); |
425 ShowSettingsSubPageForActiveUser(page); | 423 ShowSettingsSubPageForActiveUser(page); |
426 } | 424 } |
427 | 425 |
428 void SystemTrayClient::ShowProxySettings() { | 426 void SystemTrayClient::ShowProxySettings() { |
429 LoginState* login_state = LoginState::Get(); | 427 LoginState* login_state = LoginState::Get(); |
430 // User is not logged in. | 428 // User is not logged in. |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 if (enterprise_domain == last_enterprise_domain_ && | 512 if (enterprise_domain == last_enterprise_domain_ && |
515 active_directory_managed == last_active_directory_managed_) { | 513 active_directory_managed == last_active_directory_managed_) { |
516 return; | 514 return; |
517 } | 515 } |
518 // Send to ash, which will add an item to the system tray. | 516 // Send to ash, which will add an item to the system tray. |
519 system_tray_->SetEnterpriseDomain(enterprise_domain, | 517 system_tray_->SetEnterpriseDomain(enterprise_domain, |
520 active_directory_managed); | 518 active_directory_managed); |
521 last_enterprise_domain_ = enterprise_domain; | 519 last_enterprise_domain_ = enterprise_domain; |
522 last_active_directory_managed_ = active_directory_managed; | 520 last_active_directory_managed_ = active_directory_managed; |
523 } | 521 } |
OLD | NEW |