Separate handler initialization from page initialization

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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 524 matching lines @@
 
 void BrowserOptionsHandler::OnStateChanged() {
   scoped_ptr<DictionaryValue> value(GetSyncStateDictionary());
   web_ui()->CallJavascriptFunction("BrowserOptions.updateSyncState", *value);
 
   SendProfilesInfo();
 }
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
+
+  // Create our favicon data source.
+  profile->GetChromeURLDataManager()->AddDataSource(
+      new FaviconSource(profile, FaviconSource::FAVICON));
+}
+
+void BrowserOptionsHandler::InitializePage() {
+  Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
   ProfileSyncService* sync_service(
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
   if (sync_service)
     sync_service->AddObserver(this);
-  OnStateChanged();
-
-  // Create our favicon data source.
-  profile->GetChromeURLDataManager()->AddDataSource(
-      new FaviconSource(profile, FaviconSource::FAVICON));
 
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
                                g_browser_process->local_state(),
                                this);
   UpdateDefaultBrowserState();
 
   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,
@@ skipping 34 matching lines @@
                                 g_browser_process->local_state(), this);
 #endif
 
   auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
   default_font_size_.Init(prefs::kWebKitGlobalDefaultFontSize, prefs, this);
   default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
 #if !defined(OS_CHROMEOS)
   proxy_prefs_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
 #endif  // !defined(OS_CHROMEOS)
-}
 
-void BrowserOptionsHandler::InitializePage() {
+  OnStateChanged();
   OnTemplateURLServiceChanged();
   ObserveThemeChanged();
 
   if (multiprofile_)
     SendProfilesInfo();
 
   SetupMetricsReportingCheckbox();
   SetupMetricsReportingSettingVisibility();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
@@ skipping 789 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2