chromeos: Refactor system tray "show settings" commands to use 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 54 matching lines @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/ash/cast_config_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/cast_config_delegate_media_router.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
-#include "chrome/browser/ui/ash/system_tray_common.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 304 matching lines @@
 
 bool SystemTrayDelegateChromeOS::IsUserChild() const {
   return user_manager::UserManager::Get()->IsLoggedInAsChildUser();
 }
 
 void SystemTrayDelegateChromeOS::GetSystemUpdateInfo(
     ash::UpdateInfo* info) const {
   GetUpdateInfo(UpgradeDetector::GetInstance(), info);
 }
 
-void SystemTrayDelegateChromeOS::ShowSettings() {
-  SystemTrayCommon::ShowSettings();
-}
-
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
   ash::WmShell* wm_shell = ash::WmShell::Get();
   return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() &&
          !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
-  // TODO(mash): Refactor out GetNativeWindow and move to SystemTrayCommon.
+  // TODO(mash): Refactor out GetNativeWindow and move to SystemTrayClient.
   SetTimeDialog::ShowDialog(GetNativeWindow());
 }
 
 void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
     const std::string& guid) {
-  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayCommon.
+  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayClient.
   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() {
-  SystemTrayCommon::ShowDisplaySettings();
-}
-
-void SystemTrayDelegateChromeOS::ShowPowerSettings() {
-  SystemTrayCommon::ShowPowerSettings();
-}
-
-void SystemTrayDelegateChromeOS::ShowChromeSlow() {
-  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, SystemTrayCommon::kDisplaySettingsSubPageName) &&
+             visible_url, SystemTrayClient::kDisplaySettingsSubPageName) &&
          !chrome::IsSettingsSubPage(
              visible_url,
-             SystemTrayCommon::kDisplayOverscanSettingsSubPageName);
-}
-
-void SystemTrayDelegateChromeOS::ShowIMESettings() {
-  SystemTrayCommon::ShowIMESettings();
-}
-
-void SystemTrayDelegateChromeOS::ShowHelp() {
-  SystemTrayCommon::ShowHelp();
-}
-
-void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
-  SystemTrayCommon::ShowAccessibilityHelp();
-}
-
-void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() {
-  SystemTrayCommon::ShowAccessibilitySettings();
-}
-
-void SystemTrayDelegateChromeOS::ShowPaletteHelp() {
-  SystemTrayCommon::ShowPaletteHelp();
-}
-
-void SystemTrayDelegateChromeOS::ShowPaletteSettings() {
-  SystemTrayCommon::ShowPaletteSettings();
-}
-
-void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
-  SystemTrayCommon::ShowPublicAccountInfo();
+             SystemTrayClient::kDisplayOverscanSettingsSubPageName);
 }
 
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
-  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayCommon.
+  // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayClient.
   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::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 {
   return networking_config_delegate_.get();
 }
@@ skipping 526 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos