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

Side by Side Diff: chrome/browser/gtk/options/content_page_gtk.cc

Issue 3007004: [GTK] Fix pref initialization order so options page doesn't instantly crash. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/options/content_page_gtk.h" 5 #include "chrome/browser/gtk/options/content_page_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/gtk_util.h" 9 #include "app/gtk_util.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 scoped_ptr<OptionsLayoutBuilderGtk> 91 scoped_ptr<OptionsLayoutBuilderGtk>
92 options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout()); 92 options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());
93 options_builder->AddWidget(managed_prefs_banner_.banner_widget(), false); 93 options_builder->AddWidget(managed_prefs_banner_.banner_widget(), false);
94 if (sync_service_) { 94 if (sync_service_) {
95 options_builder->AddOptionGroup( 95 options_builder->AddOptionGroup(
96 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_GROUP_NAME), 96 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_GROUP_NAME),
97 InitSyncGroup(), false); 97 InitSyncGroup(), false);
98 UpdateSyncControls(); 98 UpdateSyncControls();
99 } 99 }
100 100
101 // Add preferences observers.
102 ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
103 profile->GetPrefs(), this);
104 if (browser_defaults::kCanToggleSystemTitleBar) {
105 use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame,
106 profile->GetPrefs(), this);
107 }
108
101 options_builder->AddOptionGroup( 109 options_builder->AddOptionGroup(
102 l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_GROUP_NAME), 110 l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_GROUP_NAME),
103 InitPasswordSavingGroup(), false); 111 InitPasswordSavingGroup(), false);
104 options_builder->AddOptionGroup( 112 options_builder->AddOptionGroup(
105 l10n_util::GetStringUTF8(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME), 113 l10n_util::GetStringUTF8(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
106 InitFormAutoFillGroup(), false); 114 InitFormAutoFillGroup(), false);
107 #if !defined(OS_CHROMEOS) 115 #if !defined(OS_CHROMEOS)
108 options_builder->AddOptionGroup( 116 options_builder->AddOptionGroup(
109 l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME), 117 l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME),
110 InitBrowsingDataGroup(), false); 118 InitBrowsingDataGroup(), false);
111 #endif 119 #endif
112 options_builder->AddOptionGroup( 120 options_builder->AddOptionGroup(
113 l10n_util::GetStringUTF8(IDS_APPEARANCE_GROUP_NAME), 121 l10n_util::GetStringUTF8(IDS_APPEARANCE_GROUP_NAME),
114 InitThemesGroup(), false); 122 InitThemesGroup(), false);
115 page_ = options_builder->get_page_widget(); 123 page_ = options_builder->get_page_widget();
116 124
117 // Add preferences observers.
118 ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
119 profile->GetPrefs(), this);
120
121 if (browser_defaults::kCanToggleSystemTitleBar) {
122 use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame,
123 profile->GetPrefs(), this);
124 }
125
126 // Load initial values. 125 // Load initial values.
127 NotifyPrefChanged(NULL); 126 NotifyPrefChanged(NULL);
128 127
129 registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, 128 registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
130 NotificationService::AllSources()); 129 NotificationService::AllSources());
131 ObserveThemeChanged(); 130 ObserveThemeChanged();
132 } 131 }
133 132
134 ContentPageGtk::~ContentPageGtk() { 133 ContentPageGtk::~ContentPageGtk() {
135 if (sync_service_) 134 if (sync_service_)
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 if (response == GTK_RESPONSE_ACCEPT) { 593 if (response == GTK_RESPONSE_ACCEPT) {
595 sync_service_->DisableForUser(); 594 sync_service_->DisableForUser();
596 ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS); 595 ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
597 } 596 }
598 gtk_widget_destroy(widget); 597 gtk_widget_destroy(widget);
599 } 598 }
600 599
601 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) { 600 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) {
602 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate(); 601 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
603 } 602 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698