Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1155)

Unified Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 9693032: [uber page] Split up initialization of handlers from initialization of webui pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright bumps Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 2a9dece6809536a8934de899e77ba214e9e2c8de..2992af10222dcf73714c43ad0e6af4cc2feed349 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -535,7 +535,7 @@ void BrowserOptionsHandler::OnStateChanged() {
SendProfilesInfo();
}
-void BrowserOptionsHandler::Initialize() {
+void BrowserOptionsHandler::InitializeHandler() {
Profile* profile = Profile::FromWebUI(web_ui());
PrefService* prefs = profile->GetPrefs();
@@ -564,8 +564,7 @@ void BrowserOptionsHandler::Initialize() {
content::Source<ThemeService>(
ThemeServiceFactory::GetForProfile(profile)));
- UpdateSearchEngines();
- ObserveThemeChanged();
+ AddTemplateUrlServiceObserver();
#if defined(OS_WIN)
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
@@ -603,6 +602,14 @@ void BrowserOptionsHandler::Initialize() {
proxy_prefs_.reset(
PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
#endif // !defined(OS_CHROMEOS)
+}
+
+void BrowserOptionsHandler::InitializePage() {
+ OnTemplateURLServiceChanged();
+ ObserveThemeChanged();
+
+ if (multiprofile_)
+ SendProfilesInfo();
SetupMetricsReportingCheckbox();
SetupMetricsReportingSettingVisibility();
@@ -802,13 +809,12 @@ void BrowserOptionsHandler::SetDefaultSearchEngine(const ListValue* args) {
content::RecordAction(UserMetricsAction("Options_SearchEngineChanged"));
}
-void BrowserOptionsHandler::UpdateSearchEngines() {
+void BrowserOptionsHandler::AddTemplateUrlServiceObserver() {
template_url_service_ =
TemplateURLServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
if (template_url_service_) {
template_url_service_->Load();
template_url_service_->AddObserver(this);
- OnTemplateURLServiceChanged();
}
}

Powered by Google App Engine
This is Rietveld 408576698