chromeos: Refactor system tray ShowNetworkSettingsForGuid for mash

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 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_client.h"
 
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.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/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/mojo_shell_connection.h"
+#include "net/base/escape.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using chromeos::LoginState;
 
 namespace {
 
 const char kPaletteSettingsSubPageName[] = "stylus-overlay";
 
 SystemTrayClient* g_instance = nullptr;
@@ skipping 24 matching lines @@
   g_instance = nullptr;
 
   g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
 }
 
 // static
 SystemTrayClient* SystemTrayClient::Get() {
   return g_instance;
 }
 
-void SystemTrayClient::ConnectToSystemTray() {
-  if (system_tray_.is_bound())
-    return;
-
-  shell::Connector* connector =
-      content::MojoShellConnection::GetForProcess()->GetConnector();
-  // Under mash the SystemTray interface is in the ash process. In classic ash
-  // we provide it to ourself.
-  if (chrome::IsRunningInMash())
-    connector->ConnectToInterface("mojo:ash", &system_tray_);
-  else
-    connector->ConnectToInterface("exe:content_browser", &system_tray_);
-
-  // Tolerate ash crashing and coming back up.
-  system_tray_.set_connection_error_handler(base::Bind(
-      &SystemTrayClient::OnClientConnectionError, base::Unretained(this)));
-}
-
-void SystemTrayClient::OnClientConnectionError() {
-  system_tray_.reset();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   ShowSettingsSubPageForActiveUser(std::string());
 }
 
 void SystemTrayClient::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   std::string sub_page =
@@ skipping 55 matching lines @@
   content::RecordAction(base::UserMetricsAction("ShowPaletteOptions"));
   ShowSettingsSubPageForActiveUser(kPaletteSettingsSubPageName);
 }
 
 void SystemTrayClient::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
+void SystemTrayClient::ShowNetworkSettings(const std::string& network_id) {
+  if (!LoginState::Get()->IsUserLoggedIn())
+    return;
+
+  // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964

[msw, 2016/10/05 22:56:36]

bummer, but yeah...

+  if (!chrome::IsRunningInMash() &&
+      ash::WmShell::Get()
+          ->GetSessionStateDelegate()
+          ->IsInSecondaryLoginScreen())
+    return;
+
+  std::string page = chrome::kInternetOptionsSubPage;
+  if (!network_id.empty())
+    page += "?guid=" + net::EscapeUrlEncodedData(network_id, true);
+  content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
+  ShowSettingsSubPageForActiveUser(page);
+}
+
 void SystemTrayClient::ShowProxySettings() {
   LoginState* login_state = LoginState::Get();
   // User is not logged in.
   CHECK(!login_state->IsUserLoggedIn() ||
         login_state->GetLoggedInUserType() == LoginState::LOGGED_IN_USER_NONE);
   chromeos::LoginDisplayHost::default_host()->OpenProxySettings();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // chromeos::system::SystemClockObserver:
 
 void SystemTrayClient::OnSystemClockChanged(
     chromeos::system::SystemClock* clock) {
   ConnectToSystemTray();
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }
+
+void SystemTrayClient::ConnectToSystemTray() {
+  if (system_tray_.is_bound())
+    return;
+
+  shell::Connector* connector =
+      content::MojoShellConnection::GetForProcess()->GetConnector();
+  // Under mash the SystemTray interface is in the ash process. In classic ash
+  // we provide it to ourself.
+  if (chrome::IsRunningInMash())
+    connector->ConnectToInterface("mojo:ash", &system_tray_);
+  else
+    connector->ConnectToInterface("exe:content_browser", &system_tray_);
+
+  // Tolerate ash crashing and coming back up.
+  system_tray_.set_connection_error_handler(base::Bind(
+      &SystemTrayClient::OnClientConnectionError, base::Unretained(this)));
+}
+
+void SystemTrayClient::OnClientConnectionError() {
+  system_tray_.reset();
+}