mustash: Connect ash system tray "show settings" items to chrome over mojo

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 27 matching lines @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
@@ skipping 59 matching lines @@
 namespace chromeos {
 
 namespace {
 
 // The minimum session length limit that can be set.
 const int kSessionLengthLimitMinMs = 30 * 1000;  // 30 seconds.
 
 // The maximum session length limit that can be set.
 const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000;  // 24 hours.
 
-const char kDisplaySettingsSubPageName[] = "display";
-const char kDisplayOverscanSettingsSubPageName[] = "displayOverscan";
-const char kPaletteSettingsSubPageName[] = "stylus-overlay";
-
 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
                     const input_method::InputMethodUtil& util,
                     ash::IMEInfo* info) {
   info->id = ime.id();
   info->name = util.GetInputMethodLongName(ime);
   info->medium_name = util.GetInputMethodMediumName(ime);
   info->short_name = util.GetInputMethodShortName(ime);
   info->third_party = extension_ime_util::IsExtensionIME(ime.id());
 }
 
@@ skipping 203 matching lines @@
       return ash::LoginStatus::PUBLIC;
     case LoginState::LOGGED_IN_USER_SUPERVISED:
       return ash::LoginStatus::SUPERVISED;
     case LoginState::LOGGED_IN_USER_KIOSK_APP:
       return ash::LoginStatus::KIOSK_APP;
   }
   NOTREACHED();
   return ash::LoginStatus::NOT_LOGGED_IN;
 }
 
-void SystemTrayDelegateChromeOS::ChangeProfilePicture() {
-  content::RecordAction(
-      base::UserMetricsAction("OpenChangeProfilePictureDialog"));
-  ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage);
-}
-
 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const {
   return enterprise_domain_;
 }
 
 base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const {
   if (GetEnterpriseDomain().empty())
     return base::string16();
   return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                     base::UTF8ToUTF16(GetEnterpriseDomain()));
 }
@@ skipping 34 matching lines @@
 void SystemTrayDelegateChromeOS::GetSystemUpdateInfo(
     ash::UpdateInfo* info) const {
   GetUpdateInfo(UpgradeDetector::GetInstance(), info);
 }
 
 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
   return clock_type_;
 }
 
 void SystemTrayDelegateChromeOS::ShowSettings() {
-  ShowSettingsSubPageForActiveUser("");
+  SystemTrayCommon::ShowSettings();
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
   ash::WmShell* wm_shell = ash::WmShell::Get();
   return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() &&
          !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 void SystemTrayDelegateChromeOS::ShowDateSettings() {
   SystemTrayCommon::ShowDateSettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
+  // TODO(mash): Refactor out GetNativeWindow and move to SystemTrayCommon.
   SetTimeDialog::ShowDialog(GetNativeWindow());
 }
 
 void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
     const std::string& guid) {
+  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayCommon.
   ash::WmShell* wm_shell = ash::WmShell::Get();
   if (LoginState::Get()->IsUserLoggedIn() &&
       !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
     std::string page = chrome::kInternetOptionsSubPage;
     if (!guid.empty())
       page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
     content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
     ShowSettingsSubPageForActiveUser(page);
   }
 }
 
 void SystemTrayDelegateChromeOS::ShowDisplaySettings() {
-  content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
-  ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);
+  SystemTrayCommon::ShowDisplaySettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowPowerSettings() {
+  // TODO(mash): Refactor out ash::PowerStatus and move to SystemTrayCommon.
   if (!(switches::PowerOverlayEnabled() ||
         (ash::PowerStatus::Get()->IsBatteryPresent() &&
          ash::PowerStatus::Get()->SupportsDualRoleDevices()))) {
     return;
   }
   content::RecordAction(base::UserMetricsAction("Tray_ShowPowerOptions"));
   ShowSettingsSubPageForActiveUser(chrome::kPowerOptionsSubPage);
 }
 
 void SystemTrayDelegateChromeOS::ShowChromeSlow() {
-  chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetPrimaryUserProfile());
-  chrome::ShowSlow(displayer.browser());
+  SystemTrayCommon::ShowChromeSlow();
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowDisplayNotification() {
   // Packaged app is not counted as 'last active', so if a browser opening the
   // display settings is in background of a packaged app, it will return true.
   // TODO(mukai): fix this.
   Browser* active_browser = chrome::FindLastActive();
   if (!active_browser)
     return true;
 
   content::WebContents* active_contents =
       active_browser->tab_strip_model()->GetActiveWebContents();
   if (!active_contents)
     return true;
 
   GURL visible_url = active_contents->GetLastCommittedURL();
-  return !(chrome::IsSettingsSubPage(visible_url,
-                                     kDisplaySettingsSubPageName) ||
-           chrome::IsSettingsSubPage(visible_url,
-                                     kDisplayOverscanSettingsSubPageName));
+  return !chrome::IsSettingsSubPage(
+             visible_url, SystemTrayCommon::kDisplaySettingsSubPageName) &&
+         !chrome::IsSettingsSubPage(
+             visible_url,
+             SystemTrayCommon::kDisplayOverscanSettingsSubPageName);
 }
 
 void SystemTrayDelegateChromeOS::ShowIMESettings() {
-  content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
-  ShowSettingsSubPageForActiveUser(chrome::kLanguageOptionsSubPage);
+  SystemTrayCommon::ShowIMESettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowHelp() {
-  chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(),
-                             chrome::HELP_SOURCE_MENU);
+  SystemTrayCommon::ShowHelp();
 }
 
 void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
-  chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile());
-  accessibility::ShowAccessibilityHelp(displayer.browser());
+  SystemTrayCommon::ShowAccessibilityHelp();
 }
 
 void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() {
-  content::RecordAction(base::UserMetricsAction("ShowAccessibilitySettings"));
-  std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
-                         l10n_util::GetStringUTF8(
-                             IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
-  ShowSettingsSubPageForActiveUser(sub_page);
+  SystemTrayCommon::ShowAccessibilitySettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowPaletteHelp() {
-  chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile());
-  chrome::ShowSingletonTab(displayer.browser(),
-                           GURL(chrome::kChromePaletteHelpURL));
+  SystemTrayCommon::ShowPaletteHelp();
 }
 
 void SystemTrayDelegateChromeOS::ShowPaletteSettings() {
-  content::RecordAction(base::UserMetricsAction("ShowPaletteOptions"));
-  ShowSettingsSubPageForActiveUser(kPaletteSettingsSubPageName);
+  SystemTrayCommon::ShowPaletteSettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
-  chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile());
-  chrome::ShowPolicy(displayer.browser());
-}
-
-void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
-  // TODO(antrim): find out what should we show in this case.
-  // http://crbug.com/229762
+  SystemTrayCommon::ShowPublicAccountInfo();
 }
 
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
+  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayCommon.
   ash::LoginStatus status = GetUserLoginStatus();
   ash::WmShell* wm_shell = ash::WmShell::Get();
   if (status == ash::LoginStatus::NOT_LOGGED_IN ||
       status == ash::LoginStatus::LOCKED ||
       wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
     scoped_refptr<chromeos::HelpAppLauncher> help_app(
         new chromeos::HelpAppLauncher(GetNativeWindow()));
     help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
   } else {
     chrome::ScopedTabbedBrowserDisplayer displayer(
@@ skipping 213 matching lines @@
 
 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
   return bluetooth_adapter_ && bluetooth_adapter_->IsPowered();
 }
 
 bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() {
   return bluetooth_discovery_session_ &&
          bluetooth_discovery_session_->IsActive();
 }
 
-void SystemTrayDelegateChromeOS::ChangeProxySettings() {
-  CHECK(GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN);
-  LoginDisplayHost::default_host()->OpenProxySettings();
+void SystemTrayDelegateChromeOS::ShowProxySettings() {
+  SystemTrayCommon::ShowProxySettings();
 }
 
 ash::CastConfigDelegate* SystemTrayDelegateChromeOS::GetCastConfigDelegate() {
   if (!cast_config_delegate_)
     cast_config_delegate_ = CreateCastConfigDelegate();
   return cast_config_delegate_.get();
 }
 
 ash::NetworkingConfigDelegate*
 SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const {
@@ skipping 541 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos