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

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: Fix browser_tests 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled, 241 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
242 g_browser_process->local_state(), this); 242 g_browser_process->local_state(), this);
243 243
244 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 244 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
245 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled, 245 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled,
246 g_browser_process->local_state(), 246 g_browser_process->local_state(),
247 this); 247 this);
248 #endif 248 #endif
249 249
250 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this); 250 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
251 default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this); 251 default_font_size_.Init(prefs::kWebKitGlobalDefaultFontSize, prefs, this);
252 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this); 252 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
253 #if !defined(OS_CHROMEOS) 253 #if !defined(OS_CHROMEOS)
254 proxy_prefs_.reset( 254 proxy_prefs_.reset(
255 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this)); 255 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
256 #endif // !defined(OS_CHROMEOS) 256 #endif // !defined(OS_CHROMEOS)
257 257
258 // Return result from the superclass. 258 // Return result from the superclass.
259 return handler; 259 return handler;
260 } 260 }
261 261
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 #if !defined(OS_CHROMEOS) 321 #if !defined(OS_CHROMEOS)
322 } else if (proxy_prefs_->IsObserved(*pref_name)) { 322 } else if (proxy_prefs_->IsObserved(*pref_name)) {
323 SetupProxySettingsSection(); 323 SetupProxySettingsSection();
324 #endif // !defined(OS_CHROMEOS) 324 #endif // !defined(OS_CHROMEOS)
325 } else if ((*pref_name == prefs::kCloudPrintEmail) || 325 } else if ((*pref_name == prefs::kCloudPrintEmail) ||
326 (*pref_name == prefs::kCloudPrintProxyEnabled)) { 326 (*pref_name == prefs::kCloudPrintProxyEnabled)) {
327 #if !defined(OS_CHROMEOS) 327 #if !defined(OS_CHROMEOS)
328 if (cloud_print_proxy_ui_enabled_) 328 if (cloud_print_proxy_ui_enabled_)
329 SetupCloudPrintProxySection(); 329 SetupCloudPrintProxySection();
330 #endif 330 #endif
331 } else if (*pref_name == prefs::kWebKitDefaultFontSize) { 331 } else if (*pref_name == prefs::kWebKitGlobalDefaultFontSize) {
332 SetupFontSizeSelector(); 332 SetupFontSizeSelector();
333 } else if (*pref_name == prefs::kDefaultZoomLevel) { 333 } else if (*pref_name == prefs::kDefaultZoomLevel) {
334 SetupPageZoomSelector(); 334 SetupPageZoomSelector();
335 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 335 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
336 } else if (*pref_name == prefs::kBackgroundModeEnabled) { 336 } else if (*pref_name == prefs::kBackgroundModeEnabled) {
337 SetupBackgroundModeSettings(); 337 SetupBackgroundModeSettings();
338 #endif 338 #endif
339 } 339 }
340 } 340 }
341 } 341 }
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 632
633 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 633 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
634 { 634 {
635 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 635 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
636 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 636 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
637 web_ui_->CallJavascriptFunction( 637 web_ui_->CallJavascriptFunction(
638 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, 638 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
639 disabled); 639 disabled);
640 } 640 }
641 } 641 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698