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

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

Issue 1419103009: [Sync] Componentize ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@max_bogue_sync_backend_host
Patch Set: Rebase Created 5 years, 1 month 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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/profiles/profile_shortcut_manager.h" 43 #include "chrome/browser/profiles/profile_shortcut_manager.h"
44 #include "chrome/browser/profiles/profile_window.h" 44 #include "chrome/browser/profiles/profile_window.h"
45 #include "chrome/browser/profiles/profiles_state.h" 45 #include "chrome/browser/profiles/profiles_state.h"
46 #include "chrome/browser/search/hotword_audio_history_handler.h" 46 #include "chrome/browser/search/hotword_audio_history_handler.h"
47 #include "chrome/browser/search/hotword_service.h" 47 #include "chrome/browser/search/hotword_service.h"
48 #include "chrome/browser/search/hotword_service_factory.h" 48 #include "chrome/browser/search/hotword_service_factory.h"
49 #include "chrome/browser/search/search.h" 49 #include "chrome/browser/search/search.h"
50 #include "chrome/browser/search_engines/template_url_service_factory.h" 50 #include "chrome/browser/search_engines/template_url_service_factory.h"
51 #include "chrome/browser/signin/easy_unlock_service.h" 51 #include "chrome/browser/signin/easy_unlock_service.h"
52 #include "chrome/browser/signin/signin_manager_factory.h" 52 #include "chrome/browser/signin/signin_manager_factory.h"
53 #include "chrome/browser/sync/profile_sync_service.h"
54 #include "chrome/browser/sync/profile_sync_service_factory.h" 53 #include "chrome/browser/sync/profile_sync_service_factory.h"
55 #include "chrome/browser/sync/sync_ui_util.h" 54 #include "chrome/browser/sync/sync_ui_util.h"
56 #include "chrome/browser/themes/theme_service.h" 55 #include "chrome/browser/themes/theme_service.h"
57 #include "chrome/browser/themes/theme_service_factory.h" 56 #include "chrome/browser/themes/theme_service_factory.h"
58 #include "chrome/browser/ui/browser_finder.h" 57 #include "chrome/browser/ui/browser_finder.h"
59 #include "chrome/browser/ui/chrome_select_file_policy.h" 58 #include "chrome/browser/ui/chrome_select_file_policy.h"
60 #include "chrome/browser/ui/host_desktop.h" 59 #include "chrome/browser/ui/host_desktop.h"
61 #include "chrome/browser/ui/passwords/manage_passwords_view_utils_desktop.h" 60 #include "chrome/browser/ui/passwords/manage_passwords_view_utils_desktop.h"
62 #include "chrome/browser/ui/webui/favicon_source.h" 61 #include "chrome/browser/ui/webui/favicon_source.h"
63 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" 62 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
64 #include "chrome/common/chrome_constants.h" 63 #include "chrome/common/chrome_constants.h"
65 #include "chrome/common/chrome_paths.h" 64 #include "chrome/common/chrome_paths.h"
66 #include "chrome/common/chrome_switches.h" 65 #include "chrome/common/chrome_switches.h"
67 #include "chrome/common/extensions/extension_constants.h" 66 #include "chrome/common/extensions/extension_constants.h"
68 #include "chrome/common/pref_names.h" 67 #include "chrome/common/pref_names.h"
69 #include "chrome/common/url_constants.h" 68 #include "chrome/common/url_constants.h"
70 #include "chrome/grit/chromium_strings.h" 69 #include "chrome/grit/chromium_strings.h"
71 #include "chrome/grit/generated_resources.h" 70 #include "chrome/grit/generated_resources.h"
72 #include "chrome/grit/locale_settings.h" 71 #include "chrome/grit/locale_settings.h"
72 #include "components/browser_sync/browser/profile_sync_service.h"
73 #include "components/metrics/metrics_pref_names.h" 73 #include "components/metrics/metrics_pref_names.h"
74 #include "components/policy/core/common/policy_map.h" 74 #include "components/policy/core/common/policy_map.h"
75 #include "components/policy/core/common/policy_namespace.h" 75 #include "components/policy/core/common/policy_namespace.h"
76 #include "components/policy/core/common/policy_service.h" 76 #include "components/policy/core/common/policy_service.h"
77 #include "components/proximity_auth/switches.h" 77 #include "components/proximity_auth/switches.h"
78 #include "components/proxy_config/proxy_config_pref_names.h" 78 #include "components/proxy_config/proxy_config_pref_names.h"
79 #include "components/search_engines/template_url.h" 79 #include "components/search_engines/template_url.h"
80 #include "components/search_engines/template_url_service.h" 80 #include "components/search_engines/template_url_service.h"
81 #include "components/signin/core/browser/signin_manager.h" 81 #include "components/signin/core/browser/signin_manager.h"
82 #include "components/signin/core/common/profile_management_switches.h" 82 #include "components/signin/core/common/profile_management_switches.h"
(...skipping 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after
2185 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2185 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2186 const policy::PolicyMap& previous, 2186 const policy::PolicyMap& previous,
2187 const policy::PolicyMap& current) { 2187 const policy::PolicyMap& current) {
2188 std::set<std::string> different_keys; 2188 std::set<std::string> different_keys;
2189 current.GetDifferingKeys(previous, &different_keys); 2189 current.GetDifferingKeys(previous, &different_keys);
2190 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2190 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2191 SetupMetricsReportingCheckbox(); 2191 SetupMetricsReportingCheckbox();
2192 } 2192 }
2193 2193
2194 } // namespace options 2194 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698