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

chrome/browser/dom_ui/options/personal_options_handler.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/dom_ui/options/personal_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/path_service.h"
@@ skipping 102 matching lines @@
       l10n_util::GetStringUTF16(IDS_THEMES_DEFAULT_THEME_LABEL));
 #endif
 }
 
 void PersonalOptionsHandler::RegisterMessages() {
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback(
       "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));
+      "getThemesGalleryURL",

[arv (Not doing code reviews), 2010/11/12 01:17:25]

Is there a reason why this cannot be included in the localized strings and
injected using i18n-values="href:themes_gallery_url"?

[James Hawkins, 2010/11/12 21:15:29]

I tried using that construct and it didn't work.  Is it supposed to?

[James Hawkins, 2010/11/12 23:47:20]

Done.

+      NewCallback(this, &PersonalOptionsHandler::GetThemesGalleryURL));
 #if defined(TOOLKIT_GTK)
   dom_ui_->RegisterMessageCallback(
       "themesSetGTK",
       NewCallback(this, &PersonalOptionsHandler::ThemesSetGTK));
 #endif
 }
 
 void PersonalOptionsHandler::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
@@ skipping 130 matching lines @@
     OnStateChanged();
   }
 }
 
 void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) {
   ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();
   service->ShowLoginDialog(NULL);
   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();
+void PersonalOptionsHandler::GetThemesGalleryURL(const ListValue* args) {
+  StringValue url(l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_URL));
+  dom_ui_->CallJavascriptFunction(
+      L"options.PersonalOptions.setThemesGalleryURL", url);
 }
 
 #if defined(TOOLKIT_GTK)
 void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_GtkThemeSet"));
   dom_ui_->GetProfile()->SetNativeTheme();
 }
 #endif