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

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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 | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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) 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/prefs/pref_service.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "base/value_conversions.h" 20 #include "base/value_conversions.h"
21 #include "base/values.h" 21 #include "base/values.h"
22 #include "chrome/browser/auto_launch_trial.h" 22 #include "chrome/browser/auto_launch_trial.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/chrome_page_zoom.h" 24 #include "chrome/browser/chrome_page_zoom.h"
25 #include "chrome/browser/custom_home_pages_table_model.h" 25 #include "chrome/browser/custom_home_pages_table_model.h"
26 #include "chrome/browser/download/download_prefs.h" 26 #include "chrome/browser/download/download_prefs.h"
27 #include "chrome/browser/instant/search.h"
27 #include "chrome/browser/net/url_fixer_upper.h" 28 #include "chrome/browser/net/url_fixer_upper.h"
28 #include "chrome/browser/policy/user_cloud_policy_manager.h" 29 #include "chrome/browser/policy/user_cloud_policy_manager.h"
29 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" 30 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
30 #include "chrome/browser/prefs/session_startup_pref.h" 31 #include "chrome/browser/prefs/session_startup_pref.h"
31 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 33 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
33 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 34 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
34 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" 35 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
35 #include "chrome/browser/profiles/profile_info_cache.h" 36 #include "chrome/browser/profiles/profile_info_cache.h"
36 #include "chrome/browser/profiles/profile_info_util.h" 37 #include "chrome/browser/profiles/profile_info_util.h"
37 #include "chrome/browser/profiles/profile_manager.h" 38 #include "chrome/browser/profiles/profile_manager.h"
38 #include "chrome/browser/profiles/profile_shortcut_manager.h" 39 #include "chrome/browser/profiles/profile_shortcut_manager.h"
39 #include "chrome/browser/search_engines/template_url.h" 40 #include "chrome/browser/search_engines/template_url.h"
40 #include "chrome/browser/search_engines/template_url_service.h" 41 #include "chrome/browser/search_engines/template_url_service.h"
41 #include "chrome/browser/search_engines/template_url_service_factory.h" 42 #include "chrome/browser/search_engines/template_url_service_factory.h"
42 #include "chrome/browser/service/service_process_control.h" 43 #include "chrome/browser/service/service_process_control.h"
43 #include "chrome/browser/signin/signin_manager.h" 44 #include "chrome/browser/signin/signin_manager.h"
44 #include "chrome/browser/signin/signin_manager_factory.h" 45 #include "chrome/browser/signin/signin_manager_factory.h"
45 #include "chrome/browser/sync/profile_sync_service.h" 46 #include "chrome/browser/sync/profile_sync_service.h"
46 #include "chrome/browser/sync/profile_sync_service_factory.h" 47 #include "chrome/browser/sync/profile_sync_service_factory.h"
47 #include "chrome/browser/sync/sync_ui_util.h" 48 #include "chrome/browser/sync/sync_ui_util.h"
48 #include "chrome/browser/themes/theme_service.h" 49 #include "chrome/browser/themes/theme_service.h"
49 #include "chrome/browser/themes/theme_service_factory.h" 50 #include "chrome/browser/themes/theme_service_factory.h"
50 #include "chrome/browser/ui/browser_finder.h" 51 #include "chrome/browser/ui/browser_finder.h"
51 #include "chrome/browser/ui/chrome_select_file_policy.h" 52 #include "chrome/browser/ui/chrome_select_file_policy.h"
52 #include "chrome/browser/ui/host_desktop.h" 53 #include "chrome/browser/ui/host_desktop.h"
53 #include "chrome/browser/ui/options/options_util.h" 54 #include "chrome/browser/ui/options/options_util.h"
54 #include "chrome/browser/ui/search/search.h"
55 #include "chrome/browser/ui/webui/favicon_source.h" 55 #include "chrome/browser/ui/webui/favicon_source.h"
56 #include "chrome/common/chrome_constants.h" 56 #include "chrome/common/chrome_constants.h"
57 #include "chrome/common/chrome_notification_types.h" 57 #include "chrome/common/chrome_notification_types.h"
58 #include "chrome/common/chrome_paths.h" 58 #include "chrome/common/chrome_paths.h"
59 #include "chrome/common/chrome_switches.h" 59 #include "chrome/common/chrome_switches.h"
60 #include "chrome/common/pref_names.h" 60 #include "chrome/common/pref_names.h"
61 #include "chrome/common/url_constants.h" 61 #include "chrome/common/url_constants.h"
62 #include "content/public/browser/browser_thread.h" 62 #include "content/public/browser/browser_thread.h"
63 #include "content/public/browser/download_manager.h" 63 #include "content/public/browser/download_manager.h"
64 #include "content/public/browser/navigation_controller.h" 64 #include "content/public/browser/navigation_controller.h"
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1469 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1470 is_extension_controlled); 1470 is_extension_controlled);
1471 base::FundamentalValue extension_controlled(is_extension_controlled); 1471 base::FundamentalValue extension_controlled(is_extension_controlled);
1472 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1472 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1473 disabled, extension_controlled); 1473 disabled, extension_controlled);
1474 1474
1475 #endif // !defined(OS_CHROMEOS) 1475 #endif // !defined(OS_CHROMEOS)
1476 } 1476 }
1477 1477
1478 } // namespace options 1478 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698