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

Side by Side Diff: chrome/browser/chrome_content_browser_client.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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
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/files/scoped_file.h" 16 #include "base/files/scoped_file.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/prefs/pref_service.h"
21 #include "base/prefs/scoped_user_pref_update.h"
22 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
24 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
25 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
26 #include "base/thread_task_runner_handle.h" 24 #include "base/thread_task_runner_handle.h"
27 #include "base/threading/sequenced_worker_pool.h" 25 #include "base/threading/sequenced_worker_pool.h"
28 #include "build/build_config.h" 26 #include "build/build_config.h"
29 #include "chrome/browser/after_startup_task_utils.h" 27 #include "chrome/browser/after_startup_task_utils.h"
30 #include "chrome/browser/apps/app_url_redirector.h" 28 #include "chrome/browser/apps/app_url_redirector.h"
31 #include "chrome/browser/browser_about_handler.h" 29 #include "chrome/browser/browser_about_handler.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #include "components/content_settings/core/browser/host_content_settings_map.h" 111 #include "components/content_settings/core/browser/host_content_settings_map.h"
114 #include "components/content_settings/core/common/content_settings.h" 112 #include "components/content_settings/core/common/content_settings.h"
115 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" 113 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h"
116 #include "components/dom_distiller/core/dom_distiller_switches.h" 114 #include "components/dom_distiller/core/dom_distiller_switches.h"
117 #include "components/dom_distiller/core/url_constants.h" 115 #include "components/dom_distiller/core/url_constants.h"
118 #include "components/error_page/common/error_page_switches.h" 116 #include "components/error_page/common/error_page_switches.h"
119 #include "components/google/core/browser/google_util.h" 117 #include "components/google/core/browser/google_util.h"
120 #include "components/metrics/client_info.h" 118 #include "components/metrics/client_info.h"
121 #include "components/net_log/chrome_net_log.h" 119 #include "components/net_log/chrome_net_log.h"
122 #include "components/pref_registry/pref_registry_syncable.h" 120 #include "components/pref_registry/pref_registry_syncable.h"
121 #include "components/prefs/pref_service.h"
122 #include "components/prefs/scoped_user_pref_update.h"
123 #include "components/rappor/rappor_utils.h" 123 #include "components/rappor/rappor_utils.h"
124 #include "components/security_interstitials/core/ssl_error_ui.h" 124 #include "components/security_interstitials/core/ssl_error_ui.h"
125 #include "components/signin/core/common/profile_management_switches.h" 125 #include "components/signin/core/common/profile_management_switches.h"
126 #include "components/startup_metric_utils/browser/startup_metric_message_filter. h" 126 #include "components/startup_metric_utils/browser/startup_metric_message_filter. h"
127 #include "components/translate/core/common/translate_switches.h" 127 #include "components/translate/core/common/translate_switches.h"
128 #include "components/url_formatter/url_fixer.h" 128 #include "components/url_formatter/url_fixer.h"
129 #include "components/variations/variations_associated_data.h" 129 #include "components/variations/variations_associated_data.h"
130 #include "components/version_info/version_info.h" 130 #include "components/version_info/version_info.h"
131 #include "content/public/browser/browser_child_process_host.h" 131 #include "content/public/browser/browser_child_process_host.h"
132 #include "content/public/browser/browser_main_parts.h" 132 #include "content/public/browser/browser_main_parts.h"
(...skipping 2756 matching lines...) Expand 10 before | Expand all | Expand 10 after
2889 if (channel <= kMaxDisableEncryptionChannel) { 2889 if (channel <= kMaxDisableEncryptionChannel) {
2890 static const char* const kWebRtcDevSwitchNames[] = { 2890 static const char* const kWebRtcDevSwitchNames[] = {
2891 switches::kDisableWebRtcEncryption, 2891 switches::kDisableWebRtcEncryption,
2892 }; 2892 };
2893 to_command_line->CopySwitchesFrom(from_command_line, 2893 to_command_line->CopySwitchesFrom(from_command_line,
2894 kWebRtcDevSwitchNames, 2894 kWebRtcDevSwitchNames,
2895 arraysize(kWebRtcDevSwitchNames)); 2895 arraysize(kWebRtcDevSwitchNames));
2896 } 2896 }
2897 } 2897 }
2898 #endif // defined(ENABLE_WEBRTC) 2898 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698