chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

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

Issue 12189011: Split up chrome/browser/policy subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gyp cleanup 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 | Annotate | Revision Log

« chrome/browser/policy/browser_policy_connector.h ('K') | « chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | chrome/browser/ui/webui/policy_ui.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/instant/search.h"

28 #include "chrome/browser/net/url_fixer_upper.h"	28 #include "chrome/browser/net/url_fixer_upper.h"

29 #include "chrome/browser/policy/user_cloud_policy_manager.h"	29 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"

30 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"	30 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
	Joao da Silva 2013/03/13 15:54:44 These should be #ifdef ENABLE_CONFIGURATION_POLICY These should be #ifdef ENABLE_CONFIGURATION_POLICY. They aren't used though, remove? Mattias Nissler (ping if slow) 2013/03/13 17:30:36 Done. Show quoted text On 2013/03/13 15:54:44, Joao da Silva wrote: > These should be #ifdef ENABLE_CONFIGURATION_POLICY. > > They aren't used though, remove? Done.
31 #include "chrome/browser/prefs/session_startup_pref.h"	31 #include "chrome/browser/prefs/session_startup_pref.h"

32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"	32 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

33 #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"

34 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"	34 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"

35 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"	35 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"

36 #include "chrome/browser/profiles/profile_info_cache.h"	36 #include "chrome/browser/profiles/profile_info_cache.h"

37 #include "chrome/browser/profiles/profile_info_util.h"	37 #include "chrome/browser/profiles/profile_info_util.h"

38 #include "chrome/browser/profiles/profile_manager.h"	38 #include "chrome/browser/profiles/profile_manager.h"

39 #include "chrome/browser/profiles/profile_shortcut_manager.h"	39 #include "chrome/browser/profiles/profile_shortcut_manager.h"

40 #include "chrome/browser/search_engines/template_url.h"	40 #include "chrome/browser/search_engines/template_url.h"

(...skipping 1429 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1470 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() \|\|	1470 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() \|\|

1471 is_extension_controlled);	1471 is_extension_controlled);

1472 base::FundamentalValue extension_controlled(is_extension_controlled);	1472 base::FundamentalValue extension_controlled(is_extension_controlled);

1473 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",	1473 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",

1474 disabled, extension_controlled);	1474 disabled, extension_controlled);

1475	1475

1476 #endif // !defined(OS_CHROMEOS)	1476 #endif // !defined(OS_CHROMEOS)

1477 }	1477 }

1478	1478

1479 } // namespace options	1479 } // namespace options

OLD	NEW