summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser.cc6
-rw-r--r--chrome/browser/browser.h2
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc6
-rw-r--r--chrome/browser/views/options/content_page_view.cc5
4 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 292cea5..83f697f 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1230,6 +1230,12 @@ void Browser::OpenExtensionsTab() {
PageTransition::AUTO_BOOKMARK, true, -1, false, NULL);
}
+void Browser::OpenThemeGalleryTabAndActivate() {
+ OpenURL(GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
+ GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ window_->Activate();
+}
+
#if defined(OS_CHROMEOS)
void Browser::ShowControlPanel() {
UserMetrics::RecordAction(L"ShowControlPanel", profile_);
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index c7d91e4..c3a2552 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -406,6 +406,8 @@ class Browser : public TabStripModelDelegate,
void OpenAboutChromeDialog();
void OpenHelpTab();
void OpenExtensionsTab();
+ // Used by the "Get themes" link in the options dialog.
+ void OpenThemeGalleryTabAndActivate();
#if defined(OS_CHROMEOS)
void ShowControlPanel();
#endif
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 98fa532..3782605 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -7,7 +7,9 @@
#include "app/gfx/gtk_util.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
#include "chrome/browser/gtk/gtk_chrome_link_button.h"
@@ -309,9 +311,7 @@ void ContentPageGtk::OnGetThemesButtonClicked(GtkButton* widget,
ContentPageGtk* page) {
page->UserMetricsRecordAction(L"Options_ThemesGallery",
page->profile()->GetPrefs());
- BrowserList::GetLastActive()->OpenURL(
- GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
- GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
}
// static
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index f5e99ff..fef0cbc 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -144,10 +144,7 @@ void ContentPageView::ButtonPressed(
void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
if (source == themes_gallery_link_) {
UserMetricsRecordAction(L"Options_ThemesGallery", profile()->GetPrefs());
- Browser* browser = BrowserList::GetLastActive();
- browser->OpenURL(GURL(l10n_util::GetString(IDS_THEMES_GALLERY_URL)),
- GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
- browser->window()->Activate();
+ BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
return;
}
DCHECK_EQ(source, sync_action_link_);