Merge 62408 - Fixes bugs in usage of adding a new tab with a disposition of...

chrome/browser/gtk/options/advanced_contents_gtk.cc

 // Copyright (c) 2010 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/gtk/options/advanced_contents_gtk.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <string>
@@ skipping 21 matching lines @@
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "chrome/browser/show_options_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/process_watcher.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
@@ skipping 308 matching lines @@
     const char** argv;
   };
   // The callback functions for invoking the proxy config dialog.
   static void OnChangeProxiesButtonClicked(GtkButton *button,
                                            NetworkSection* section);
   // Search $PATH to find one of the commands. Store the full path to
   // it in the |binary| field and the command array index in in |index|.
   static bool SearchPATH(ProxyConfigCommand* commands, size_t ncommands,
                          size_t* index);
   // Start the given proxy configuration utility.
-  static void StartProxyConfigUtil(const ProxyConfigCommand& command);
+  static void StartProxyConfigUtil(Profile* profile,
+                                   const ProxyConfigCommand& command);
 
   // Tracks the state of proxy preferences.
   scoped_ptr<PrefSetObserver> proxy_prefs_;
 
   // The widget containing the options for this section.
   GtkWidget* page_;
 
   // The proxy configuration button.
   GtkWidget* change_proxies_button_;
 
@@ skipping 67 matching lines @@
       command.argv = kKDE4ProxyConfigCommand;
       found_command = SearchPATH(&command, 1, NULL);
       break;
 
     case base::DESKTOP_ENVIRONMENT_XFCE:
     case base::DESKTOP_ENVIRONMENT_OTHER:
       break;
   }
 
   if (found_command) {
-    StartProxyConfigUtil(command);
+    StartProxyConfigUtil(section->profile(), command);
   } else {
     const char* name = base::GetDesktopEnvironmentName(env.get());
     if (name)
       LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
-    BrowserList::GetLastActive()->
-        OpenURL(GURL(kLinuxProxyConfigUrl),
-                GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+    browser::ShowOptionsURL(section->profile(), GURL(kLinuxProxyConfigUrl));
   }
 }
 
 // static
 bool NetworkSection::SearchPATH(ProxyConfigCommand* commands, size_t ncommands,
                                 size_t* index) {
   const char* path = getenv("PATH");
   if (!path)
     return false;
   FilePath bin_path;
   CStringTokenizer tk(path, path + strlen(path), ":");
   // Search $PATH looking for the commands in order.
   while (tk.GetNext()) {
     for (size_t i = 0; i < ncommands; i++) {
       bin_path = FilePath(tk.token()).Append(commands[i].argv[0]);
       if (file_util::PathExists(bin_path)) {
         commands[i].binary = bin_path.value();
         if (index)
           *index = i;
         return true;
       }
     }
   }
   // Did not find any of the binaries in $PATH.
   return false;
 }
 
 // static
-void NetworkSection::StartProxyConfigUtil(const ProxyConfigCommand& command) {
+void NetworkSection::StartProxyConfigUtil(Profile* profile,
+                                          const ProxyConfigCommand& command) {
   std::vector<std::string> argv;
   argv.push_back(command.binary);
   for (size_t i = 1; command.argv[i]; i++)
     argv.push_back(command.argv[i]);
   base::file_handle_mapping_vector no_files;
   base::ProcessHandle handle;
   if (!base::LaunchApp(argv, no_files, false, &handle)) {
     LOG(ERROR) << "StartProxyConfigUtil failed to start " << command.binary;
-    BrowserList::GetLastActive()->
-        OpenURL(GURL(kLinuxProxyConfigUrl), GURL(), NEW_FOREGROUND_TAB,
-                PageTransition::LINK);
+    browser::ShowOptionsURL(profile, GURL(kLinuxProxyConfigUrl));
     return;
   }
   ProcessWatcher::EnsureProcessGetsReaped(handle);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TranslateSection
 
 class TranslateSection : public OptionsPageBase {
  public:
@@ skipping 160 matching lines @@
   bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
   UserMetricsRecordAction(
       enabled ?
       UserMetricsAction("Options_BackgroundMode_Enable") :
       UserMetricsAction("Options_BackgroundMode_Disable"),
       profile()->GetPrefs());
   enable_background_mode_.SetValue(enabled);
 }
 
 void ChromeAppsSection::OnLearnMoreLinkClicked(GtkWidget* widget) {
-  BrowserList::GetLastActive()->OpenURL(
-      GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_BACKGROUND_MODE_URL)),
-      GURL(), NEW_WINDOW, PageTransition::LINK);
+  browser::ShowOptionsURL(
+      profile(),
+      GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_BACKGROUND_MODE_URL)));
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // PrivacySection
 
 class PrivacySection : public OptionsPageBase {
  public:
   explicit PrivacySection(Profile* profile);
   virtual ~PrivacySection() {}
@@ skipping 178 matching lines @@
 void PrivacySection::OnClearBrowsingDataButtonClicked(GtkButton* widget,
                                                       PrivacySection* section) {
   ClearBrowsingDataDialogGtk::Show(
       GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))),
       section->profile());
 }
 
 // static
 void PrivacySection::OnLearnMoreLinkClicked(GtkButton *button,
                                             PrivacySection* privacy_section) {
-  BrowserList::GetLastActive()->
-      OpenURL(GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_PRIVACY_URL)),
-              GURL(), NEW_WINDOW, PageTransition::LINK);
+  browser::ShowOptionsURL(
+      privacy_section->profile(),
+      GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_PRIVACY_URL)));
 }
 
 // static
 void PrivacySection::OnEnableLinkDoctorChange(GtkWidget* widget,
                                               PrivacySection* privacy_section) {
   if (privacy_section->pref_changing_)
     return;
   bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
   privacy_section->UserMetricsRecordAction(
       enabled ?
@@ skipping 277 matching lines @@
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tls1_enabled_checkbox_),
                                  tls1_enabled_.GetValue());
   }
   pref_changing_ = false;
 }
 
 
 // static
 void SecuritySection::OnManageCertificatesClicked(GtkButton* button,
                                                   SecuritySection* section) {
-  BrowserList::GetLastActive()->
-      OpenURL(GURL(kLinuxCertificatesConfigUrl), GURL(), NEW_WINDOW,
-              PageTransition::LINK);
+  browser::ShowOptionsURL(section->profile(),
+                          GURL(kLinuxCertificatesConfigUrl));
 }
 
 // static
 void SecuritySection::OnRevCheckingEnabledToggled(GtkToggleButton* togglebutton,
                                                   SecuritySection* section) {
   if (section->pref_changing_)
     return;
 
   bool enabled = gtk_toggle_button_get_active(togglebutton);
   if (enabled) {
@@ skipping 165 matching lines @@
   // Add ChromeApps preferences if background mode is runtime-enabled.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBackgroundMode)) {
     chrome_apps_section_.reset(new ChromeAppsSection(profile_));
     options_builder->AddOptionGroup(l10n_util::GetStringUTF8(
         IDS_OPTIONS_ADVANCED_SECTION_TITLE_CHROME_APPS),
         chrome_apps_section_->get_page_widget(), false);
   }
   page_ = options_builder->get_page_widget();
 }