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

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/favicon/DEPS » ('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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/extensions/extension_service.h" 36 #include "chrome/browser/extensions/extension_service.h"
37 #include "chrome/browser/extensions/extension_system.h" 37 #include "chrome/browser/extensions/extension_system.h"
38 #include "chrome/browser/extensions/extension_web_ui.h" 38 #include "chrome/browser/extensions/extension_web_ui.h"
39 #include "chrome/browser/extensions/extension_webkit_preferences.h" 39 #include "chrome/browser/extensions/extension_webkit_preferences.h"
40 #include "chrome/browser/extensions/message_handler.h" 40 #include "chrome/browser/extensions/message_handler.h"
41 #include "chrome/browser/extensions/suggest_permission_util.h" 41 #include "chrome/browser/extensions/suggest_permission_util.h"
42 #include "chrome/browser/geolocation/chrome_access_token_store.h" 42 #include "chrome/browser/geolocation/chrome_access_token_store.h"
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/instant/search.h"
46 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 47 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
47 #include "chrome/browser/nacl_host/nacl_process_host.h" 48 #include "chrome/browser/nacl_host/nacl_process_host.h"
48 #include "chrome/browser/net/chrome_net_log.h" 49 #include "chrome/browser/net/chrome_net_log.h"
49 #include "chrome/browser/notifications/desktop_notification_service.h" 50 #include "chrome/browser/notifications/desktop_notification_service.h"
50 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 51 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
51 #include "chrome/browser/platform_util.h" 52 #include "chrome/browser/platform_util.h"
52 #include "chrome/browser/plugins/plugin_info_message_filter.h" 53 #include "chrome/browser/plugins/plugin_info_message_filter.h"
53 #include "chrome/browser/prefs/scoped_user_pref_update.h" 54 #include "chrome/browser/prefs/scoped_user_pref_update.h"
54 #include "chrome/browser/prerender/prerender_manager.h" 55 #include "chrome/browser/prerender/prerender_manager.h"
55 #include "chrome/browser/prerender/prerender_manager_factory.h" 56 #include "chrome/browser/prerender/prerender_manager_factory.h"
(...skipping 10 matching lines...) Expand all
66 #include "chrome/browser/signin/signin_manager.h" 67 #include "chrome/browser/signin/signin_manager.h"
67 #include "chrome/browser/signin/signin_manager_factory.h" 68 #include "chrome/browser/signin/signin_manager_factory.h"
68 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 69 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
69 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 70 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
70 #include "chrome/browser/ssl/ssl_add_certificate.h" 71 #include "chrome/browser/ssl/ssl_add_certificate.h"
71 #include "chrome/browser/ssl/ssl_blocking_page.h" 72 #include "chrome/browser/ssl/ssl_blocking_page.h"
72 #include "chrome/browser/ssl/ssl_tab_helper.h" 73 #include "chrome/browser/ssl/ssl_tab_helper.h"
73 #include "chrome/browser/tab_contents/tab_util.h" 74 #include "chrome/browser/tab_contents/tab_util.h"
74 #include "chrome/browser/toolkit_extra_parts.h" 75 #include "chrome/browser/toolkit_extra_parts.h"
75 #include "chrome/browser/ui/chrome_select_file_policy.h" 76 #include "chrome/browser/ui/chrome_select_file_policy.h"
76 #include "chrome/browser/ui/search/search.h"
77 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 77 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
78 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 78 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
79 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 79 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
80 #include "chrome/browser/user_style_sheet_watcher.h" 80 #include "chrome/browser/user_style_sheet_watcher.h"
81 #include "chrome/browser/user_style_sheet_watcher_factory.h" 81 #include "chrome/browser/user_style_sheet_watcher_factory.h"
82 #include "chrome/browser/view_type_utils.h" 82 #include "chrome/browser/view_type_utils.h"
83 #include "chrome/common/child_process_logging.h" 83 #include "chrome/common/child_process_logging.h"
84 #include "chrome/common/chrome_constants.h" 84 #include "chrome/common/chrome_constants.h"
85 #include "chrome/common/chrome_paths.h" 85 #include "chrome/common/chrome_paths.h"
86 #include "chrome/common/chrome_switches.h" 86 #include "chrome/common/chrome_switches.h"
(...skipping 2034 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 io_thread_application_locale_ = locale; 2121 io_thread_application_locale_ = locale;
2122 } 2122 }
2123 2123
2124 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2124 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2125 const std::string& locale) { 2125 const std::string& locale) {
2126 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2126 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2127 io_thread_application_locale_ = locale; 2127 io_thread_application_locale_ = locale;
2128 } 2128 }
2129 2129
2130 } // namespace chrome 2130 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/favicon/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698