DOMUI: Turn the google dashboard link into a real link and fix the behavior of

the 'Get Themes' link.

BUG=62887
TEST=none

Review URL: http://codereview.chromium.org/4821003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66166 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 23 deletions

diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc
index 4c776b9..8eb86e7 100644
--- a/chrome/browser/dom_ui/options/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/options/personal_options_handler.cc
@@ -89,6 +89,11 @@ void PersonalOptionsHandler::GetLocalizedValues(
   localized_strings->SetString("import_data",
       l10n_util::GetStringUTF16(IDS_OPTIONS_IMPORT_DATA_BUTTON));
 
+  localized_strings->SetString("themes_gallery",
+      l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_BUTTON));
+  localized_strings->SetString("themes_gallery_url",
+      l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_URL));
+
 #if defined(TOOLKIT_GTK)
   localized_strings->SetString("appearance",
       l10n_util::GetStringUTF16(IDS_APPEARANCE_GROUP_NAME));
@@ -100,15 +105,11 @@ void PersonalOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_SHOW_WINDOW_DECORATIONS_RADIO));
   localized_strings->SetString("hideWindow_decorations_radio",
       l10n_util::GetStringUTF16(IDS_HIDE_WINDOW_DECORATIONS_RADIO));
-  localized_strings->SetString("themes_gallery",
-      l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_BUTTON));
 #else
   localized_strings->SetString("themes",
       l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME));
   localized_strings->SetString("themes_reset",
       l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON));
-  localized_strings->SetString("themes_gallery",
-      l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_BUTTON));
   localized_strings->SetString("themes_default",
       l10n_util::GetStringUTF16(IDS_THEMES_DEFAULT_THEME_LABEL));
 #endif
@@ -120,15 +121,8 @@ void PersonalOptionsHandler::RegisterMessages() {
       "showSyncLoginDialog",
       NewCallback(this, &PersonalOptionsHandler::ShowSyncLoginDialog));
   dom_ui_->RegisterMessageCallback(
-      "openPrivacyDashboardTabAndActivate",
-      NewCallback(this,
-                  &PersonalOptionsHandler::OpenPrivacyDashboardTabAndActivate));
-  dom_ui_->RegisterMessageCallback(
       "themesReset",
       NewCallback(this, &PersonalOptionsHandler::ThemesReset));
-  dom_ui_->RegisterMessageCallback(
-      "themesGallery",
-      NewCallback(this, &PersonalOptionsHandler::ThemesGallery));
 #if defined(TOOLKIT_GTK)
   dom_ui_->RegisterMessageCallback(
       "themesSetGTK",
@@ -279,21 +273,11 @@ void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) {
   ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
 }
 
-void PersonalOptionsHandler::OpenPrivacyDashboardTabAndActivate(
-    const ListValue* args) {
-  BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
-}
-
 void PersonalOptionsHandler::ThemesReset(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_ThemesReset"));
   dom_ui_->GetProfile()->ClearTheme();
 }
 
-void PersonalOptionsHandler::ThemesGallery(const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction("Options_ThemesGallery"));
-  BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
-}
-
 #if defined(TOOLKIT_GTK)
 void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_GtkThemeSet"));
diff --git a/chrome/browser/dom_ui/options/personal_options_handler.h b/chrome/browser/dom_ui/options/personal_options_handler.h
index 6c6f080..8ee3649 100644
--- a/chrome/browser/dom_ui/options/personal_options_handler.h
+++ b/chrome/browser/dom_ui/options/personal_options_handler.h
@@ -36,9 +36,7 @@ class PersonalOptionsHandler : public OptionsPageUIHandler,
  private:
   void ObserveThemeChanged();
   void ShowSyncLoginDialog(const ListValue* args);
-  void OpenPrivacyDashboardTabAndActivate(const ListValue* args);
   void ThemesReset(const ListValue* args);
-  void ThemesGallery(const ListValue* args);
 #if defined(TOOLKIT_GTK)
   void ThemesSetGTK(const ListValue* args);
 #endif