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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR 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
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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/google/google_util.h" 43 #include "chrome/browser/google/google_util.h"
44 #include "chrome/browser/instant/instant_service.h" 44 #include "chrome/browser/instant/instant_service.h"
45 #include "chrome/browser/instant/instant_service_factory.h" 45 #include "chrome/browser/instant/instant_service_factory.h"
46 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 46 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
47 #include "chrome/browser/nacl_host/nacl_process_host.h" 47 #include "chrome/browser/nacl_host/nacl_process_host.h"
48 #include "chrome/browser/net/chrome_net_log.h" 48 #include "chrome/browser/net/chrome_net_log.h"
49 #include "chrome/browser/notifications/desktop_notification_service.h" 49 #include "chrome/browser/notifications/desktop_notification_service.h"
50 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 50 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
51 #include "chrome/browser/platform_util.h" 51 #include "chrome/browser/platform_util.h"
52 #include "chrome/browser/plugins/plugin_info_message_filter.h" 52 #include "chrome/browser/plugins/plugin_info_message_filter.h"
53 #include "chrome/browser/prefs/pref_registry_syncable.h"
54 #include "chrome/browser/prefs/scoped_user_pref_update.h" 53 #include "chrome/browser/prefs/scoped_user_pref_update.h"
55 #include "chrome/browser/prerender/prerender_manager.h" 54 #include "chrome/browser/prerender/prerender_manager.h"
56 #include "chrome/browser/prerender/prerender_manager_factory.h" 55 #include "chrome/browser/prerender/prerender_manager_factory.h"
57 #include "chrome/browser/prerender/prerender_message_filter.h" 56 #include "chrome/browser/prerender/prerender_message_filter.h"
58 #include "chrome/browser/prerender/prerender_tracker.h" 57 #include "chrome/browser/prerender/prerender_tracker.h"
59 #include "chrome/browser/printing/printing_message_filter.h" 58 #include "chrome/browser/printing/printing_message_filter.h"
60 #include "chrome/browser/profiles/profile.h" 59 #include "chrome/browser/profiles/profile.h"
61 #include "chrome/browser/profiles/profile_io_data.h" 60 #include "chrome/browser/profiles/profile_io_data.h"
62 #include "chrome/browser/profiles/profile_manager.h" 61 #include "chrome/browser/profiles/profile_manager.h"
63 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 62 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
(...skipping 20 matching lines...) Expand all
84 #include "chrome/common/chrome_switches.h" 83 #include "chrome/common/chrome_switches.h"
85 #include "chrome/common/extensions/background_info.h" 84 #include "chrome/common/extensions/background_info.h"
86 #include "chrome/common/extensions/extension.h" 85 #include "chrome/common/extensions/extension.h"
87 #include "chrome/common/extensions/extension_process_policy.h" 86 #include "chrome/common/extensions/extension_process_policy.h"
88 #include "chrome/common/extensions/extension_set.h" 87 #include "chrome/common/extensions/extension_set.h"
89 #include "chrome/common/extensions/permissions/socket_permission.h" 88 #include "chrome/common/extensions/permissions/socket_permission.h"
90 #include "chrome/common/logging_chrome.h" 89 #include "chrome/common/logging_chrome.h"
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "chrome/common/render_messages.h" 91 #include "chrome/common/render_messages.h"
93 #include "chrome/common/url_constants.h" 92 #include "chrome/common/url_constants.h"
93 #include "components/user_prefs/pref_registry_syncable.h"
94 #include "content/public/browser/browser_child_process_host.h" 94 #include "content/public/browser/browser_child_process_host.h"
95 #include "content/public/browser/browser_main_parts.h" 95 #include "content/public/browser/browser_main_parts.h"
96 #include "content/public/browser/browser_ppapi_host.h" 96 #include "content/public/browser/browser_ppapi_host.h"
97 #include "content/public/browser/browser_url_handler.h" 97 #include "content/public/browser/browser_url_handler.h"
98 #include "content/public/browser/child_process_data.h" 98 #include "content/public/browser/child_process_data.h"
99 #include "content/public/browser/child_process_security_policy.h" 99 #include "content/public/browser/child_process_security_policy.h"
100 #include "content/public/browser/compositor_util.h" 100 #include "content/public/browser/compositor_util.h"
101 #include "content/public/browser/render_process_host.h" 101 #include "content/public/browser/render_process_host.h"
102 #include "content/public/browser/render_view_host.h" 102 #include "content/public/browser/render_view_host.h"
103 #include "content/public/browser/resource_context.h" 103 #include "content/public/browser/resource_context.h"
(...skipping 1992 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 io_thread_application_locale_ = locale; 2096 io_thread_application_locale_ = locale;
2097 } 2097 }
2098 2098
2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2100 const std::string& locale) { 2100 const std::string& locale) {
2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2102 io_thread_application_locale_ = locale; 2102 io_thread_application_locale_ = locale;
2103 } 2103 }
2104 2104
2105 } // namespace chrome 2105 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698