OLD | NEW |
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/ui/views/external_tab_container_win.h" | 5 #include "chrome/browser/ui/views/external_tab_container_win.h" |
6 | 6 |
7 #include <atlbase.h> | 7 #include <atlbase.h> |
8 #include <atlapp.h> | 8 #include <atlapp.h> |
9 #include <atlconv.h> | 9 #include <atlconv.h> |
10 #include <atlmisc.h> | 10 #include <atlmisc.h> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "base/win/win_util.h" | 22 #include "base/win/win_util.h" |
23 #include "chrome/app/chrome_command_ids.h" | 23 #include "chrome/app/chrome_command_ids.h" |
24 #include "chrome/app/chrome_dll_resource.h" | 24 #include "chrome/app/chrome_dll_resource.h" |
25 #include "chrome/browser/automation/automation_provider.h" | 25 #include "chrome/browser/automation/automation_provider.h" |
26 #include "chrome/browser/devtools/devtools_toggle_action.h" | 26 #include "chrome/browser/devtools/devtools_toggle_action.h" |
27 #include "chrome/browser/devtools/devtools_window.h" | 27 #include "chrome/browser/devtools/devtools_window.h" |
28 #include "chrome/browser/file_select_helper.h" | 28 #include "chrome/browser/file_select_helper.h" |
29 #include "chrome/browser/history/history_tab_helper.h" | 29 #include "chrome/browser/history/history_tab_helper.h" |
30 #include "chrome/browser/history/history_types.h" | 30 #include "chrome/browser/history/history_types.h" |
31 #include "chrome/browser/infobars/infobar_service.h" | 31 #include "chrome/browser/infobars/infobar_service.h" |
| 32 #include "chrome/browser/media/media_stream_infobar_delegate.h" |
32 #include "chrome/browser/pepper_broker_infobar_delegate.h" | 33 #include "chrome/browser/pepper_broker_infobar_delegate.h" |
33 #include "chrome/browser/profiles/profile.h" | 34 #include "chrome/browser/profiles/profile.h" |
34 #include "chrome/browser/repost_form_warning_controller.h" | 35 #include "chrome/browser/repost_form_warning_controller.h" |
35 #include "chrome/browser/themes/theme_properties.h" | 36 #include "chrome/browser/themes/theme_properties.h" |
36 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" | 37 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" |
37 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 38 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
38 #include "chrome/browser/ui/browser.h" | 39 #include "chrome/browser/ui/browser.h" |
39 #include "chrome/browser/ui/browser_tab_contents.h" | 40 #include "chrome/browser/ui/browser_tab_contents.h" |
40 #include "chrome/browser/ui/browser_window.h" | 41 #include "chrome/browser/ui/browser_window.h" |
41 #include "chrome/browser/ui/media_stream_infobar_delegate.h" | |
42 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" | 42 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" |
43 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 43 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
44 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" | 44 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" |
45 #include "chrome/common/automation_messages.h" | 45 #include "chrome/common/automation_messages.h" |
46 #include "chrome/common/chrome_constants.h" | 46 #include "chrome/common/chrome_constants.h" |
47 #include "chrome/common/chrome_notification_types.h" | 47 #include "chrome/common/chrome_notification_types.h" |
48 #include "chrome/common/render_messages.h" | 48 #include "chrome/common/render_messages.h" |
49 #include "chrome/common/url_constants.h" | 49 #include "chrome/common/url_constants.h" |
50 #include "content/public/browser/load_notification_details.h" | 50 #include "content/public/browser/load_notification_details.h" |
51 #include "content/public/browser/native_web_keyboard_event.h" | 51 #include "content/public/browser/native_web_keyboard_event.h" |
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 if (params.disposition == CURRENT_TAB) { | 1295 if (params.disposition == CURRENT_TAB) { |
1296 DCHECK(route_all_top_level_navigations_); | 1296 DCHECK(route_all_top_level_navigations_); |
1297 forward_params.disposition = NEW_FOREGROUND_TAB; | 1297 forward_params.disposition = NEW_FOREGROUND_TAB; |
1298 } | 1298 } |
1299 WebContents* new_contents = | 1299 WebContents* new_contents = |
1300 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); | 1300 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); |
1301 // support only one navigation for a dummy tab before it is killed. | 1301 // support only one navigation for a dummy tab before it is killed. |
1302 widget_->CloseNow(); | 1302 widget_->CloseNow(); |
1303 return new_contents; | 1303 return new_contents; |
1304 } | 1304 } |
OLD | NEW |