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

chrome/browser/views/options/advanced_contents_view.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/views/options/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
@@ skipping 21 matching lines @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.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/shell_dialogs.h"
+#include "chrome/browser/show_options_url.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/clear_data_view.h"
 #include "chrome/browser/views/list_background.h"
 #include "chrome/browser/views/options/content_settings_window_view.h"
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
@@ skipping 483 matching lines @@
   } else if (sender == clear_data_button_) {
     UserMetricsRecordAction(UserMetricsAction("Options_ClearData"), NULL);
     views::Window::CreateChromeWindow(
         GetWindow()->GetNativeWindow(),
         gfx::Rect(),
         new ClearDataView(profile()))->Show();
   }
 }
 
 void PrivacySection::LinkActivated(views::Link* source, int event_flags) {
-  if (source == learn_more_link_) {
-    // We open a new browser window so the Options dialog doesn't get lost
-    // behind other windows.
-    Browser* browser = Browser::Create(profile());
-    browser->OpenURL(GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)),
-                     GURL(), NEW_WINDOW, PageTransition::LINK);
-  }
+  DCHECK(source == learn_more_link_);
+  browser::ShowOptionsURL(
+      profile(),
+      GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)));
 }
 
 void PrivacySection::InitControlLayout() {
   AdvancedSection::InitControlLayout();
 
   content_settings_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON));
   clear_data_button_ =  new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON));
   section_description_label_ = new views::Label(
@@ skipping 761 matching lines @@
   bool enabled = enable_background_mode_checkbox_->checked();
   UserMetricsRecordAction(enabled ?
                           UserMetricsAction("Options_BackgroundMode_Enable") :
                           UserMetricsAction("Options_BackgroundMode_Disable"),
                           profile()->GetPrefs());
   enable_background_mode_.SetValue(enabled);
 }
 
 void ChromeAppsSection::LinkActivated(views::Link* source, int event_flags) {
   DCHECK(source == learn_more_link_);
-  Browser::Create(profile())->OpenURL(
-      GURL(l10n_util::GetString(IDS_LEARN_MORE_BACKGROUND_MODE_URL)), GURL(),
-      NEW_WINDOW, PageTransition::LINK);
+  browser::ShowOptionsURL(
+      profile(),
+      GURL(l10n_util::GetString(IDS_LEARN_MORE_BACKGROUND_MODE_URL)));
 }
 
 void ChromeAppsSection::InitControlLayout() {
   AdvancedSection::InitControlLayout();
 
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
   AddIndentedColumnSet(layout, 0);
 
@@ skipping 83 matching lines @@
       enable_disable_button_->SetLabel(
           l10n_util::GetString(IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLING_BUTTON));
       enable_disable_button_->InvalidateLayout();
       Layout();
       CloudPrintSetupFlow::OpenDialog(profile(), this,
                                       GetWindow()->GetNativeWindow());
     }
   } else if (sender == manage_printer_button_) {
     UserMetricsRecordAction(
         UserMetricsAction("Options_ManageCloudPrinters"), NULL);
-    // Open a new browser window for the management tab.  The browser
-    // will go away when the user closes that tab.
-    Browser* browser = Browser::Create(profile());
-    browser->OpenURL(CloudPrintURL(profile()).GetCloudPrintServiceManageURL(),
-                     GURL(), NEW_WINDOW, PageTransition::LINK);
+    browser::ShowOptionsURL(
+        profile(),
+        CloudPrintURL(profile()).GetCloudPrintServiceManageURL());
   }
 }
 
 void CloudPrintProxySection::OnDialogClosed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_disable_button_->SetEnabled(true);
   // If the dialog is canceled, the preference won't change, and so we
   // have to revert the button text back to the disabled state.
   if (!Enabled()) {
     enable_disable_button_->SetLabel(
@@ skipping 242 matching lines @@
 // AdvancedScrollViewContainer, views::View overrides:
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
 }