Open Options page on top of NTP.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 6aa58ae6492db57c639601ec112ef2a85efc902c..74a4c1555e5e43255372d093a3f161c1bde2b992 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -78,6 +78,7 @@
 #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"
@@ -1988,6 +1989,15 @@ 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);
 }
 
@@ -2001,6 +2011,15 @@ void Browser::OpenOptionsDialog() {
   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);
 }