Open Options page on top of NTP.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 60 matching lines @@
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/tabs/tab_finder.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
@@ skipping 1890 matching lines @@
   subst.push_back(page_url);
   std::string report_page_url =
       ReplaceStringPlaceholders(kBrokenPageUrl, subst, NULL);
   ShowSingletonTab(GURL(report_page_url));
 }
 
 void Browser::ShowOptionsTab(const std::string& sub_page) {
   GURL url(chrome::kChromeUISettingsURL + sub_page);
   browser::NavigateParams params(GetSingletonTabNavigateParams(url));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+
+  GURL ntp(chrome::kChromeUINewTabURL);

[James Hawkins, 2011/06/17 17:44:57]

You only use |ntp| once, so just use the const var.

[Greg Billock, 2011/06/17 21:16:07]

Done.

+  GURL blank(chrome::kAboutBlankURL);

[James Hawkins, 2011/06/17 17:44:57]

Same for blank.

[Greg Billock, 2011/06/17 21:16:07]

Done.

+  if ((GetSelectedTabContents()->GetURL() == ntp ||
+       GetSelectedTabContents()->GetURL() == blank) &&
+      browser::GetIndexOfSingletonTab(&params) < 0) {
+    params.disposition = CURRENT_TAB;
+  }
+
   browser::Navigate(&params);
 }
 
 void Browser::OpenClearBrowsingDataDialog() {
   UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"));
   ShowOptionsTab(chrome::kClearBrowserDataSubPage);
 }
 
 void Browser::OpenOptionsDialog() {

[James Hawkins, 2011/06/17 17:44:57]

Wha?? Why do we have two methods for opening Options? This needs a refactoring.

[Greg Billock, 2011/06/17 21:16:07]

I can do that. I wasn't sure what all went in to the two command environments.
It sure seems like they could be refactored together.

   UserMetrics::RecordAction(UserMetricsAction("ShowOptions"));
   GURL url(chrome::kChromeUISettingsURL);
   browser::NavigateParams params(GetSingletonTabNavigateParams(url));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_STAY_PUT;
+
+  GURL ntp(chrome::kChromeUINewTabURL);
+  GURL blank(chrome::kAboutBlankURL);
+  if ((GetSelectedTabContents()->GetURL() == ntp ||
+       GetSelectedTabContents()->GetURL() == blank) &&
+      browser::GetIndexOfSingletonTab(&params) < 0) {
+    params.disposition = CURRENT_TAB;
+  }
+
   browser::Navigate(&params);
 }
 
 void Browser::OpenPasswordManager() {
   UserMetrics::RecordAction(UserMetricsAction("Options_ShowPasswordManager"));
   ShowOptionsTab(chrome::kPasswordManagerSubPage);
 }
 
 void Browser::OpenImportSettingsDialog() {
   UserMetrics::RecordAction(UserMetricsAction("Import_ShowDlg"));
@@ skipping 2696 matching lines @@
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     content_restrictions = current_tab->content_restrictions();
     NavigationEntry* active_entry = current_tab->controller().GetActiveEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
     if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL()))
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
   }
   return content_restrictions;
 }