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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/environment.h" 16 #include "base/environment.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/singleton.h" 18 #include "base/memory/singleton.h"
19 #include "base/metrics/field_trial.h" 19 #include "base/metrics/field_trial.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/prefs/pref_service.h"
22 #include "base/prefs/scoped_user_pref_update.h"
23 #include "base/stl_util.h" 21 #include "base/stl_util.h"
24 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
25 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
26 #include "base/value_conversions.h" 24 #include "base/value_conversions.h"
27 #include "base/values.h" 25 #include "base/values.h"
28 #include "build/build_config.h" 26 #include "build/build_config.h"
29 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
30 #include "chrome/browser/chrome_notification_types.h" 28 #include "chrome/browser/chrome_notification_types.h"
31 #include "chrome/browser/custom_home_pages_table_model.h" 29 #include "chrome/browser/custom_home_pages_table_model.h"
32 #include "chrome/browser/download/download_prefs.h" 30 #include "chrome/browser/download/download_prefs.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "chrome/common/pref_names.h" 68 #include "chrome/common/pref_names.h"
71 #include "chrome/common/url_constants.h" 69 #include "chrome/common/url_constants.h"
72 #include "chrome/grit/chromium_strings.h" 70 #include "chrome/grit/chromium_strings.h"
73 #include "chrome/grit/generated_resources.h" 71 #include "chrome/grit/generated_resources.h"
74 #include "chrome/grit/locale_settings.h" 72 #include "chrome/grit/locale_settings.h"
75 #include "components/browser_sync/browser/profile_sync_service.h" 73 #include "components/browser_sync/browser/profile_sync_service.h"
76 #include "components/metrics/metrics_pref_names.h" 74 #include "components/metrics/metrics_pref_names.h"
77 #include "components/policy/core/common/policy_map.h" 75 #include "components/policy/core/common/policy_map.h"
78 #include "components/policy/core/common/policy_namespace.h" 76 #include "components/policy/core/common/policy_namespace.h"
79 #include "components/policy/core/common/policy_service.h" 77 #include "components/policy/core/common/policy_service.h"
78 #include "components/prefs/pref_service.h"
79 #include "components/prefs/scoped_user_pref_update.h"
80 #include "components/proximity_auth/switches.h" 80 #include "components/proximity_auth/switches.h"
81 #include "components/proxy_config/proxy_config_pref_names.h" 81 #include "components/proxy_config/proxy_config_pref_names.h"
82 #include "components/search_engines/template_url.h" 82 #include "components/search_engines/template_url.h"
83 #include "components/search_engines/template_url_service.h" 83 #include "components/search_engines/template_url_service.h"
84 #include "components/signin/core/browser/signin_manager.h" 84 #include "components/signin/core/browser/signin_manager.h"
85 #include "components/signin/core/common/profile_management_switches.h" 85 #include "components/signin/core/common/profile_management_switches.h"
86 #include "components/signin/core/common/signin_pref_names.h" 86 #include "components/signin/core/common/signin_pref_names.h"
87 #include "components/strings/grit/components_strings.h" 87 #include "components/strings/grit/components_strings.h"
88 #include "components/ui/zoom/page_zoom.h" 88 #include "components/ui/zoom/page_zoom.h"
89 #include "components/user_manager/user_type.h" 89 #include "components/user_manager/user_type.h"
(...skipping 2053 matching lines...) Expand 10 before | Expand all | Expand 10 after
2143 2143
2144 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2144 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2145 #if defined(OS_CHROMEOS) 2145 #if defined(OS_CHROMEOS)
2146 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2146 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2147 #else 2147 #else
2148 return true; 2148 return true;
2149 #endif 2149 #endif
2150 } 2150 }
2151 2151
2152 } // namespace options 2152 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698