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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log
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/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/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"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/prefs/pref_service.h"
16 #include "base/stl_util.h" 17 #include "base/stl_util.h"
17 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
18 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
19 #include "base/value_conversions.h" 20 #include "base/value_conversions.h"
20 #include "base/values.h" 21 #include "base/values.h"
21 #include "chrome/browser/auto_launch_trial.h" 22 #include "chrome/browser/auto_launch_trial.h"
22 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/chrome_page_zoom.h" 24 #include "chrome/browser/chrome_page_zoom.h"
24 #include "chrome/browser/custom_home_pages_table_model.h" 25 #include "chrome/browser/custom_home_pages_table_model.h"
25 #include "chrome/browser/download/download_prefs.h" 26 #include "chrome/browser/download/download_prefs.h"
26 #include "chrome/browser/net/url_fixer_upper.h" 27 #include "chrome/browser/net/url_fixer_upper.h"
27 #include "chrome/browser/policy/user_cloud_policy_manager.h" 28 #include "chrome/browser/policy/user_cloud_policy_manager.h"
28 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" 29 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
29 #include "chrome/browser/prefs/pref_service.h"
30 #include "chrome/browser/prefs/session_startup_pref.h" 30 #include "chrome/browser/prefs/session_startup_pref.h"
31 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 31 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
33 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 33 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
34 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" 34 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
35 #include "chrome/browser/profiles/profile_info_cache.h" 35 #include "chrome/browser/profiles/profile_info_cache.h"
36 #include "chrome/browser/profiles/profile_info_util.h" 36 #include "chrome/browser/profiles/profile_info_util.h"
37 #include "chrome/browser/profiles/profile_manager.h" 37 #include "chrome/browser/profiles/profile_manager.h"
38 #include "chrome/browser/profiles/profile_shortcut_manager.h" 38 #include "chrome/browser/profiles/profile_shortcut_manager.h"
39 #include "chrome/browser/search_engines/template_url.h" 39 #include "chrome/browser/search_engines/template_url.h"
(...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 base::FundamentalValue disabled(proxy_prefs_.IsManaged() || 1439 base::FundamentalValue disabled(proxy_prefs_.IsManaged() ||
1440 is_extension_controlled); 1440 is_extension_controlled);
1441 base::FundamentalValue extension_controlled(is_extension_controlled); 1441 base::FundamentalValue extension_controlled(is_extension_controlled);
1442 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1442 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1443 disabled, extension_controlled); 1443 disabled, extension_controlled);
1444 1444
1445 #endif // !defined(OS_CHROMEOS) 1445 #endif // !defined(OS_CHROMEOS)
1446 } 1446 }
1447 1447
1448 } // namespace options 1448 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698