[uber] Redoing the homepage selection UI

chrome/browser/ui/webui/options2/browser_options_handler2.cc

 // Copyright (c) 2012 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/ui/webui/options2/browser_options_handler2.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 99 matching lines @@
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "advancedOptionsButtonTitle", IDS_OPTIONS_ADVANCED_BUTTON_TITLE },
     { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
     { "browsingData", IDS_OPTIONS_BROWSING_DATA_GROUP_NAME },  // needed?
     { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
     { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL },
     { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
+    { "homePage", IDS_OPTIONS2_HOMEPAGE },
+    { "homePageChoose", IDS_OPTIONS2_HOMEPAGE_CHOOSE },
+    { "homePageDialogLabel", IDS_OPTIONS2_HOMEPAGE_DIALOG_LABEL },
     { "homePageTitle", IDS_OPTIONS2_HOMEPAGE_TITLE },
-    { "homepageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
-    { "homepageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
+    { "homePageNone", IDS_OPTIONS2_HOMEPAGE_NONE },
+    { "homePageNtp", IDS_OPTIONS2_HOMEPAGE_NTP },
+    { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
+    { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
     { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE },
     { "instantConfirmTitle", IDS_INSTANT_OPT_IN_TITLE },
     { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
     { "manageDataDescription", IDS_OPTIONS_MANAGE_DATA_DESCRIPTION },
     { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
     { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
     { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
     { "sectionTitleAdvanced", IDS_OPTIONS_ADVANCED_TAB_LABEL },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
     { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
     { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
     { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
     { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
     { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE },
     { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE },
     { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
     { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES },
     { "startupShowDefaultAndNewTab",
-      IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB},
+      IDS_OPTIONS2_STARTUP_SHOW_DEFAULT_AND_NEWTAB},
     { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION },
     { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES },
     { "themesGallery", IDS_THEMES_GALLERY_BUTTON },
     { "themesGalleryURL", IDS_THEMES_GALLERY_URL },
     { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME },
     { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
     { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
 #if defined(TOOLKIT_GTK)
     { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
     { "themesGTKButton", IDS_THEMES_GTK_BUTTON },
@@ skipping 227 matching lines @@
   // Create our favicon data source.
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), NULL);
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
                                g_browser_process->local_state(),
                                this);
   UpdateDefaultBrowserState();
 
-  pref_change_registrar_.Init(profile->GetPrefs());
-  pref_change_registrar_.Add(prefs::kHomePageIsNewTabPage, this);
-  pref_change_registrar_.Add(prefs::kHomePage, this);
-
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  content::NotificationService::AllSources());
 #if defined(OS_CHROMEOS)
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  content::NotificationService::AllSources());
 #endif
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
 
   UpdateSearchEngines();
-  UpdateHomePageLabel();
   ObserveThemeChanged();
 
   autocomplete_controller_.reset(new AutocompleteController(profile, this));
 
 #if defined(OS_WIN)
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowserOptionsHandler::CheckAutoLaunch,
                  weak_ptr_factory_for_ui_.GetWeakPtr(),
                  weak_ptr_factory_for_file_.GetWeakPtr()));
   weak_ptr_factory_for_ui_.DetachFromThread();
@@ skipping 171 matching lines @@
 void BrowserOptionsHandler::UpdateSearchEngines() {
   template_url_service_ =
       TemplateURLServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
   if (template_url_service_) {
     template_url_service_->Load();
     template_url_service_->AddObserver(this);
     OnTemplateURLServiceChanged();
   }
 }
 
-void BrowserOptionsHandler::UpdateHomePageLabel() const {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  PrefService* prefs = profile->GetPrefs();
-  scoped_ptr<Value> label;
-  string16 str;
-
-  if (prefs->GetBoolean(prefs::kHomePageIsNewTabPage)) {
-    str = l10n_util::GetStringUTF16(IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_NTP);
-  } else {
-    str = l10n_util::GetStringFUTF16(
-        IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_URL,
-        UTF8ToUTF16(prefs->GetString(prefs::kHomePage)));
-  }
-
-  label.reset(Value::CreateStringValue(str));
-  web_ui()->CallJavascriptFunction("BrowserOptions.updateHomePageLabel",
-                                   *label);
-}
-
 void BrowserOptionsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     ObserveThemeChanged();
 #if defined(OS_CHROMEOS)
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
     UpdateAccountPicture();
 #endif
   } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* pref = content::Details<std::string>(details).ptr();
     if (*pref == prefs::kDefaultBrowserSettingEnabled) {
       UpdateDefaultBrowserState();
-    } else if (*pref == prefs::kHomePageIsNewTabPage ||
-               *pref == prefs::kHomePage) {
-      UpdateHomePageLabel();
     } else {
       NOTREACHED();
     }
   } else if (multiprofile_ &&
              type == chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED) {
     SendProfilesInfo();
   } else {
     NOTREACHED();
   }
 }
@@ skipping 156 matching lines @@
 }
 
 void BrowserOptionsHandler::IncreaseScreenBrightnessCallback(
     const ListValue* args) {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       IncreaseScreenBrightness();
 }
 #endif
 
 }  // namespace options2