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

Side by Side Diff: chrome/browser/ui/browser.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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/download/download_shelf.h" 52 #include "chrome/browser/download/download_shelf.h"
53 #include "chrome/browser/extensions/browser_extension_window_controller.h" 53 #include "chrome/browser/extensions/browser_extension_window_controller.h"
54 #include "chrome/browser/extensions/extension_prefs.h" 54 #include "chrome/browser/extensions/extension_prefs.h"
55 #include "chrome/browser/extensions/extension_service.h" 55 #include "chrome/browser/extensions/extension_service.h"
56 #include "chrome/browser/extensions/extension_system.h" 56 #include "chrome/browser/extensions/extension_system.h"
57 #include "chrome/browser/extensions/tab_helper.h" 57 #include "chrome/browser/extensions/tab_helper.h"
58 #include "chrome/browser/favicon/favicon_tab_helper.h" 58 #include "chrome/browser/favicon/favicon_tab_helper.h"
59 #include "chrome/browser/file_select_helper.h" 59 #include "chrome/browser/file_select_helper.h"
60 #include "chrome/browser/first_run/first_run.h" 60 #include "chrome/browser/first_run/first_run.h"
61 #include "chrome/browser/google/google_url_tracker.h" 61 #include "chrome/browser/google/google_url_tracker.h"
62 #include "chrome/browser/instant/search.h"
62 #include "chrome/browser/lifetime/application_lifetime.h" 63 #include "chrome/browser/lifetime/application_lifetime.h"
63 #include "chrome/browser/net/url_fixer_upper.h" 64 #include "chrome/browser/net/url_fixer_upper.h"
64 #include "chrome/browser/notifications/notification_ui_manager.h" 65 #include "chrome/browser/notifications/notification_ui_manager.h"
65 #include "chrome/browser/pepper_broker_infobar_delegate.h" 66 #include "chrome/browser/pepper_broker_infobar_delegate.h"
66 #include "chrome/browser/prefs/incognito_mode_prefs.h" 67 #include "chrome/browser/prefs/incognito_mode_prefs.h"
67 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 68 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
68 #include "chrome/browser/profiles/profile.h" 69 #include "chrome/browser/profiles/profile.h"
69 #include "chrome/browser/profiles/profile_destroyer.h" 70 #include "chrome/browser/profiles/profile_destroyer.h"
70 #include "chrome/browser/profiles/profile_manager.h" 71 #include "chrome/browser/profiles/profile_manager.h"
71 #include "chrome/browser/profiles/profile_metrics.h" 72 #include "chrome/browser/profiles/profile_metrics.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "chrome/browser/ui/find_bar/find_bar.h" 110 #include "chrome/browser/ui/find_bar/find_bar.h"
110 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 111 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
111 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 112 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
112 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 113 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
113 #include "chrome/browser/ui/global_error/global_error.h" 114 #include "chrome/browser/ui/global_error/global_error.h"
114 #include "chrome/browser/ui/global_error/global_error_service.h" 115 #include "chrome/browser/ui/global_error/global_error_service.h"
115 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 116 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
116 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 117 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
117 #include "chrome/browser/ui/omnibox/location_bar.h" 118 #include "chrome/browser/ui/omnibox/location_bar.h"
118 #include "chrome/browser/ui/screen_capture_infobar_delegate.h" 119 #include "chrome/browser/ui/screen_capture_infobar_delegate.h"
119 #include "chrome/browser/ui/search/search.h"
120 #include "chrome/browser/ui/search/search_delegate.h" 120 #include "chrome/browser/ui/search/search_delegate.h"
121 #include "chrome/browser/ui/search/search_model.h" 121 #include "chrome/browser/ui/search/search_model.h"
122 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 122 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
123 #include "chrome/browser/ui/singleton_tabs.h" 123 #include "chrome/browser/ui/singleton_tabs.h"
124 #include "chrome/browser/ui/status_bubble.h" 124 #include "chrome/browser/ui/status_bubble.h"
125 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" 125 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
126 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 126 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
127 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 127 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
128 #include "chrome/browser/ui/tabs/dock_info.h" 128 #include "chrome/browser/ui/tabs/dock_info.h"
129 #include "chrome/browser/ui/tabs/tab_menu_model.h" 129 #include "chrome/browser/ui/tabs/tab_menu_model.h"
(...skipping 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after
2242 if (contents && !allow_js_access) { 2242 if (contents && !allow_js_access) {
2243 contents->web_contents()->GetController().LoadURL( 2243 contents->web_contents()->GetController().LoadURL(
2244 target_url, 2244 target_url,
2245 content::Referrer(), 2245 content::Referrer(),
2246 content::PAGE_TRANSITION_LINK, 2246 content::PAGE_TRANSITION_LINK,
2247 std::string()); // No extra headers. 2247 std::string()); // No extra headers.
2248 } 2248 }
2249 2249
2250 return contents != NULL; 2250 return contents != NULL;
2251 } 2251 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_unittest.cc ('k') | chrome/browser/ui/browser_instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698