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

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

Issue 1652153003: Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3
Patch Set: Add static_cast<int> to fix compilation warning on Win 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
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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 #include "chrome/browser/ui/status_bubble.h" 130 #include "chrome/browser/ui/status_bubble.h"
131 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" 131 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
132 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 132 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
133 #include "chrome/browser/ui/tab_dialogs.h" 133 #include "chrome/browser/ui/tab_dialogs.h"
134 #include "chrome/browser/ui/tab_helpers.h" 134 #include "chrome/browser/ui/tab_helpers.h"
135 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 135 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
136 #include "chrome/browser/ui/tabs/tab_menu_model.h" 136 #include "chrome/browser/ui/tabs/tab_menu_model.h"
137 #include "chrome/browser/ui/tabs/tab_strip_model.h" 137 #include "chrome/browser/ui/tabs/tab_strip_model.h"
138 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h" 138 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h"
139 #include "chrome/browser/ui/tabs/tab_utils.h" 139 #include "chrome/browser/ui/tabs/tab_utils.h"
140 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
141 #include "chrome/browser/ui/unload_controller.h" 140 #include "chrome/browser/ui/unload_controller.h"
142 #include "chrome/browser/ui/validation_message_bubble.h" 141 #include "chrome/browser/ui/validation_message_bubble.h"
143 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 142 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
144 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 143 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
145 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 144 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
146 #include "chrome/browser/ui/window_sizer/window_sizer.h" 145 #include "chrome/browser/ui/window_sizer/window_sizer.h"
147 #include "chrome/browser/upgrade_detector.h" 146 #include "chrome/browser/upgrade_detector.h"
148 #include "chrome/common/chrome_constants.h" 147 #include "chrome/common/chrome_constants.h"
149 #include "chrome/common/chrome_switches.h" 148 #include "chrome/common/chrome_switches.h"
150 #include "chrome/common/custom_handlers/protocol_handler.h" 149 #include "chrome/common/custom_handlers/protocol_handler.h"
(...skipping 12 matching lines...) Expand all
163 #include "components/bubble/bubble_controller.h" 162 #include "components/bubble/bubble_controller.h"
164 #include "components/content_settings/core/browser/host_content_settings_map.h" 163 #include "components/content_settings/core/browser/host_content_settings_map.h"
165 #include "components/favicon/content/content_favicon_driver.h" 164 #include "components/favicon/content/content_favicon_driver.h"
166 #include "components/history/core/browser/top_sites.h" 165 #include "components/history/core/browser/top_sites.h"
167 #include "components/prefs/pref_service.h" 166 #include "components/prefs/pref_service.h"
168 #include "components/search/search.h" 167 #include "components/search/search.h"
169 #include "components/security_state/security_state_model.h" 168 #include "components/security_state/security_state_model.h"
170 #include "components/sessions/core/session_types.h" 169 #include "components/sessions/core/session_types.h"
171 #include "components/sessions/core/tab_restore_service.h" 170 #include "components/sessions/core/tab_restore_service.h"
172 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 171 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
172 #include "components/toolbar/toolbar_model_impl.h"
173 #include "components/translate/core/browser/language_state.h" 173 #include "components/translate/core/browser/language_state.h"
174 #include "components/ui/zoom/zoom_controller.h" 174 #include "components/ui/zoom/zoom_controller.h"
175 #include "components/web_modal/web_contents_modal_dialog_manager.h" 175 #include "components/web_modal/web_contents_modal_dialog_manager.h"
176 #include "content/public/browser/devtools_agent_host.h" 176 #include "content/public/browser/devtools_agent_host.h"
177 #include "content/public/browser/interstitial_page.h" 177 #include "content/public/browser/interstitial_page.h"
178 #include "content/public/browser/invalidate_type.h" 178 #include "content/public/browser/invalidate_type.h"
179 #include "content/public/browser/navigation_controller.h" 179 #include "content/public/browser/navigation_controller.h"
180 #include "content/public/browser/navigation_entry.h" 180 #include "content/public/browser/navigation_entry.h"
181 #include "content/public/browser/notification_details.h" 181 #include "content/public/browser/notification_details.h"
182 #include "content/public/browser/notification_service.h" 182 #include "content/public/browser/notification_service.h"
(...skipping 2558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2741 if (contents && !allow_js_access) { 2741 if (contents && !allow_js_access) {
2742 contents->web_contents()->GetController().LoadURL( 2742 contents->web_contents()->GetController().LoadURL(
2743 target_url, 2743 target_url,
2744 content::Referrer(), 2744 content::Referrer(),
2745 ui::PAGE_TRANSITION_LINK, 2745 ui::PAGE_TRANSITION_LINK,
2746 std::string()); // No extra headers. 2746 std::string()); // No extra headers.
2747 } 2747 }
2748 2748
2749 return contents != NULL; 2749 return contents != NULL;
2750 } 2750 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698