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

Side by Side Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 8879016: Add more per-tab preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed "migration done" preference Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/options/advanced_options_handler.h" 5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled, 243 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
244 g_browser_process->local_state(), this); 244 g_browser_process->local_state(), this);
245 245
246 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 246 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
247 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled, 247 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled,
248 g_browser_process->local_state(), 248 g_browser_process->local_state(),
249 this); 249 this);
250 #endif 250 #endif
251 251
252 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this); 252 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
253 default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this); 253 default_font_size_.Init(prefs::kWebKitGlobalDefaultFontSize, prefs, this);
254 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this); 254 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
255 #if !defined(OS_CHROMEOS) 255 #if !defined(OS_CHROMEOS)
256 proxy_prefs_.reset( 256 proxy_prefs_.reset(
257 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this)); 257 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
258 #endif // !defined(OS_CHROMEOS) 258 #endif // !defined(OS_CHROMEOS)
259 259
260 // Return result from the superclass. 260 // Return result from the superclass.
261 return handler; 261 return handler;
262 } 262 }
263 263
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 #if !defined(OS_CHROMEOS) 323 #if !defined(OS_CHROMEOS)
324 } else if (proxy_prefs_->IsObserved(*pref_name)) { 324 } else if (proxy_prefs_->IsObserved(*pref_name)) {
325 SetupProxySettingsSection(); 325 SetupProxySettingsSection();
326 #endif // !defined(OS_CHROMEOS) 326 #endif // !defined(OS_CHROMEOS)
327 } else if ((*pref_name == prefs::kCloudPrintEmail) || 327 } else if ((*pref_name == prefs::kCloudPrintEmail) ||
328 (*pref_name == prefs::kCloudPrintProxyEnabled)) { 328 (*pref_name == prefs::kCloudPrintProxyEnabled)) {
329 #if !defined(OS_CHROMEOS) 329 #if !defined(OS_CHROMEOS)
330 if (cloud_print_proxy_ui_enabled_) 330 if (cloud_print_proxy_ui_enabled_)
331 SetupCloudPrintProxySection(); 331 SetupCloudPrintProxySection();
332 #endif 332 #endif
333 } else if (*pref_name == prefs::kWebKitDefaultFontSize) { 333 } else if (*pref_name == prefs::kWebKitGlobalDefaultFontSize) {
334 SetupFontSizeSelector(); 334 SetupFontSizeSelector();
335 } else if (*pref_name == prefs::kDefaultZoomLevel) { 335 } else if (*pref_name == prefs::kDefaultZoomLevel) {
336 SetupPageZoomSelector(); 336 SetupPageZoomSelector();
337 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 337 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
338 } else if (*pref_name == prefs::kBackgroundModeEnabled) { 338 } else if (*pref_name == prefs::kBackgroundModeEnabled) {
339 SetupBackgroundModeSettings(); 339 SetupBackgroundModeSettings();
340 #endif 340 #endif
341 } 341 }
342 } 342 }
343 } 343 }
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 634
635 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 635 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
636 { 636 {
637 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 637 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
638 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 638 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
639 web_ui_->CallJavascriptFunction( 639 web_ui_->CallJavascriptFunction(
640 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, 640 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
641 disabled); 641 disabled);
642 } 642 }
643 } 643 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698