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

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler.cc

Issue 10827050: Added a timezone policy and pyauto tests for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options2/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 76 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
77 #include "ui/base/l10n/l10n_util.h" 77 #include "ui/base/l10n/l10n_util.h"
78 78
79 #if !defined(OS_CHROMEOS) 79 #if !defined(OS_CHROMEOS)
80 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" 80 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
81 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h" 81 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
82 #endif 82 #endif
83 83
84 #if defined(OS_CHROMEOS) 84 #if defined(OS_CHROMEOS)
85 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 85 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
86 #include "chrome/browser/chromeos/cros_settings.h"
87 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" 86 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
88 #include "chrome/browser/chromeos/login/user_manager.h" 87 #include "chrome/browser/chromeos/login/user_manager.h"
89 #include "chrome/browser/chromeos/options/take_photo_dialog.h" 88 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
90 #include "chrome/browser/ui/browser_window.h" 89 #include "chrome/browser/ui/browser_window.h"
91 #include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h" 90 #include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h"
92 #include "ui/gfx/image/image_skia.h" 91 #include "ui/gfx/image/image_skia.h"
93 #endif // defined(OS_CHROMEOS) 92 #endif // defined(OS_CHROMEOS)
94 93
95 #if defined(OS_WIN) 94 #if defined(OS_WIN)
96 #include "chrome/installer/util/auto_launch_util.h" 95 #include "chrome/installer/util/auto_launch_util.h"
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 } 1449 }
1451 1450
1452 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1451 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1453 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1452 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1454 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1453 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1455 web_ui()->CallJavascriptFunction( 1454 web_ui()->CallJavascriptFunction(
1456 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1455 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1457 } 1456 }
1458 1457
1459 } // namespace options2 1458 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698