Implement settings in a widnow

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 <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 70 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.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"
 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "chromeos/login/login_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 109 matching lines @@
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
 void BluetoothDeviceConnectError(
     device::BluetoothDevice::ConnectErrorCode error_code) {
   // TODO(sad): Do something?
 }
 
-// Shows the settings sub page in the last active browser. If there is no such
-// browser, creates a new browser with the settings sub page.
-void ShowSettingsSubPageForAppropriateBrowser(const std::string& sub_page,
-                                              Profile* profile) {
-  chrome::ScopedTabbedBrowserDisplayer displayer(profile,
-                                                 chrome::HOST_DESKTOP_TYPE_ASH);
-  chrome::ShowSettingsSubPage(displayer.browser(), sub_page);
+void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
+  chrome::ShowSettingsSubPageForProfile(
+      ProfileManager::GetActiveUserProfile(), sub_page);
+}
+
+void ShowSettingsSubPageForPrimaryUser(const std::string& sub_page) {
+  chrome::ShowSettingsSubPageForProfile(
+      ProfileManager::GetPrimaryUserProfile(), sub_page);
 }
 
 void ShowNetworkSettingsPage(const std::string& service_path) {
   std::string page = chrome::kInternetOptionsSubPage;
   page += "?servicePath=" + net::EscapeUrlEncodedData(service_path, true);
   content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
-  ShowSettingsSubPageForAppropriateBrowser(
-      page, ProfileManager::GetPrimaryUserProfile());
+  ShowSettingsSubPageForPrimaryUser(page);
 }
 
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
   UserAddingScreen::Get()->Start();
 }
 
 }  // namespace
 
@@ skipping 174 matching lines @@
 bool SystemTrayDelegateChromeOS::IsOobeCompleted() const {
   if (!base::SysInfo::IsRunningOnChromeOS() &&
       LoginState::Get()->IsUserLoggedIn())
     return true;
   return StartupUtils::IsOobeCompleted();
 }
 
 void SystemTrayDelegateChromeOS::ChangeProfilePicture() {
   content::RecordAction(
       base::UserMetricsAction("OpenChangeProfilePictureDialog"));
-  ShowSettingsSubPageForAppropriateBrowser(
-      chrome::kChangeProfilePictureSubPage,
-      ProfileManager::GetActiveUserProfile());
+  ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage);
 }
 
 const std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const {
   return enterprise_domain_;
 }
 
 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const {
   if (GetEnterpriseDomain().empty())
     return base::string16();
   return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
@@ skipping 27 matching lines @@
 
 bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const {
   return UpgradeDetector::GetInstance()->notify_upgrade();
 }
 
 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
   return clock_type_;
 }
 
 void SystemTrayDelegateChromeOS::ShowSettings() {
-  chrome::ScopedTabbedBrowserDisplayer displayer(
-      ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
-  chrome::ShowSettings(displayer.browser());
+  ShowSettingsSubPageForActiveUser("");
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
   return UserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings();
 }
 
 void SystemTrayDelegateChromeOS::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   std::string sub_page =
       std::string(chrome::kSearchSubPage) + "#" +
       l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
   // Everybody can change the time zone (even though it is a device setting).
-  ShowSettingsSubPageForAppropriateBrowser(
-      sub_page, ProfileManager::GetActiveUserProfile());
+  ShowSettingsSubPageForActiveUser(sub_page);
 }
 
 void SystemTrayDelegateChromeOS::ShowNetworkSettings(
     const std::string& service_path) {
   if (!LoginState::Get()->IsUserLoggedIn())
     return;
   ShowNetworkSettingsPage(service_path);
 }
 
 void SystemTrayDelegateChromeOS::ShowBluetoothSettings() {
   // TODO(sad): Make this work.
 }
 
 void SystemTrayDelegateChromeOS::ShowDisplaySettings() {
   content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
-  ShowSettingsSubPageForAppropriateBrowser(
-      kDisplaySettingsSubPageName, ProfileManager::GetActiveUserProfile());
+  ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);
 }
 
 void SystemTrayDelegateChromeOS::ShowChromeSlow() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowSlow(displayer.browser());
 }
 
 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::FindLastActiveWithHostDesktopType(chrome::HOST_DESKTOP_TYPE_ASH);
   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();
-  std::string display_settings_url =
-      std::string(chrome::kChromeUISettingsURL) + kDisplaySettingsSubPageName;
-  std::string display_overscan_url = std::string(chrome::kChromeUISettingsURL) +
-                                     kDisplayOverscanSettingsSubPageName;
-  return (visible_url.spec() != display_settings_url) &&
-         (visible_url.spec() != display_overscan_url);
+  GURL display_settings_url =
+      chrome::GetSettingsUrl(kDisplaySettingsSubPageName);
+  GURL display_overscan_url =
+      chrome::GetSettingsUrl(kDisplayOverscanSettingsSubPageName);
+  return (visible_url != display_settings_url &&
+          visible_url != display_overscan_url);
 }
 
 void SystemTrayDelegateChromeOS::ShowDriveSettings() {
   // TODO(tengs): Open the drive-specific settings page once we put it in.
   // For now just show Google Drive main page.
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowSingletonTabOverwritingNTP(
       displayer.browser(),
       chrome::GetSingletonTabNavigateParams(displayer.browser(),
                                             GURL(kDriveSettingsPageURL)));
 }
 
 void SystemTrayDelegateChromeOS::ShowIMESettings() {
   content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
-  ShowSettingsSubPageForAppropriateBrowser(
-      chrome::kLanguageOptionsSubPage, ProfileManager::GetActiveUserProfile());
+  ShowSettingsSubPageForActiveUser(chrome::kLanguageOptionsSubPage);
 }
 
 void SystemTrayDelegateChromeOS::ShowHelp() {
   chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(),
                              chrome::HOST_DESKTOP_TYPE_ASH,
                              chrome::HELP_SOURCE_MENU);
 }
 
 void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
   accessibility::ShowAccessibilityHelp(displayer.browser());
 }
 
 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);
-  ShowSettingsSubPageForAppropriateBrowser(
-      sub_page, ProfileManager::GetActiveUserProfile());
+  ShowSettingsSubPageForActiveUser(sub_page);
 }
 
 void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayDelegateChromeOS::ShowLocallyManagedUserInfo() {
   // TODO(antrim): find out what should we show in this case.
@@ skipping 225 matching lines @@
     const std::string& network_id,
     gfx::NativeWindow parent_window) {
   return enrollment::CreateDialog(network_id, parent_window);
 }
 
 void SystemTrayDelegateChromeOS::ManageBluetoothDevices() {
   content::RecordAction(base::UserMetricsAction("ShowBluetoothSettingsPage"));
   std::string sub_page =
       std::string(chrome::kSearchSubPage) + "#" +
       l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
-  ShowSettingsSubPageForAppropriateBrowser(
-      sub_page, ProfileManager::GetPrimaryUserProfile());
+  ShowSettingsSubPageForPrimaryUser(sub_page);
 }
 
 void SystemTrayDelegateChromeOS::ToggleBluetooth() {
   bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
                                  base::Bind(&base::DoNothing),
                                  base::Bind(&BluetoothPowerFailure));
 }
 
 void SystemTrayDelegateChromeOS::ShowMobileSimDialog() {
   SimDialogDelegate::ShowDialog(GetNativeWindow(),
@@ skipping 484 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos