OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/external_tab_container_win.h" | 5 #include "chrome/browser/external_tab_container_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "base/win/win_util.h" | 14 #include "base/win/win_util.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/app/chrome_dll_resource.h" | 16 #include "chrome/app/chrome_dll_resource.h" |
17 #include "chrome/browser/automation/automation_provider.h" | 17 #include "chrome/browser/automation/automation_provider.h" |
18 #include "chrome/browser/debugger/devtools_toggle_action.h" | 18 #include "chrome/browser/debugger/devtools_toggle_action.h" |
19 #include "chrome/browser/debugger/devtools_window.h" | 19 #include "chrome/browser/debugger/devtools_window.h" |
| 20 #include "chrome/browser/history/history_tab_helper.h" |
20 #include "chrome/browser/history/history_types.h" | 21 #include "chrome/browser/history/history_types.h" |
21 #include "chrome/browser/history/history_tab_helper.h" | |
22 #include "chrome/browser/infobars/infobar_tab_helper.h" | 22 #include "chrome/browser/infobars/infobar_tab_helper.h" |
23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" | 24 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" |
25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
27 #include "chrome/browser/ui/browser_window.h" | 27 #include "chrome/browser/ui/browser_window.h" |
28 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 28 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
29 #include "chrome/browser/ui/views/browser_dialogs.h" | 29 #include "chrome/browser/ui/views/browser_dialogs.h" |
30 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 30 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
31 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" | 31 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" |
32 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 32 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
33 #include "chrome/common/automation_messages.h" | 33 #include "chrome/common/automation_messages.h" |
34 #include "chrome/common/chrome_constants.h" | 34 #include "chrome/common/chrome_constants.h" |
35 #include "chrome/common/chrome_notification_types.h" | 35 #include "chrome/common/chrome_notification_types.h" |
36 #include "chrome/common/render_messages.h" | 36 #include "chrome/common/render_messages.h" |
37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
38 #include "content/browser/load_notification_details.h" | 38 #include "content/browser/load_notification_details.h" |
39 #include "content/browser/renderer_host/render_view_host.h" | 39 #include "content/browser/renderer_host/render_view_host.h" |
40 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 40 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
41 #include "content/browser/tab_contents/navigation_details.h" | 41 #include "content/browser/tab_contents/navigation_details.h" |
42 #include "content/browser/tab_contents/provisional_load_details.h" | 42 #include "content/browser/tab_contents/provisional_load_details.h" |
43 #include "content/public/browser/notification_service.h" | |
44 #include "content/common/view_messages.h" | 43 #include "content/common/view_messages.h" |
45 #include "content/public/browser/native_web_keyboard_event.h" | 44 #include "content/public/browser/native_web_keyboard_event.h" |
| 45 #include "content/public/browser/notification_service.h" |
46 #include "content/public/common/bindings_policy.h" | 46 #include "content/public/common/bindings_policy.h" |
47 #include "content/public/common/page_transition_types.h" | 47 #include "content/public/common/page_transition_types.h" |
48 #include "content/public/common/page_zoom.h" | 48 #include "content/public/common/page_zoom.h" |
49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
50 #include "grit/locale_settings.h" | 50 #include "grit/locale_settings.h" |
51 #include "ui/base/l10n/l10n_util.h" | 51 #include "ui/base/l10n/l10n_util.h" |
| 52 #include "ui/base/models/menu_model.h" |
52 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
53 #include "ui/base/view_prop.h" | 54 #include "ui/base/view_prop.h" |
54 #include "ui/base/models/menu_model.h" | 55 #include "ui/views/layout/grid_layout.h" |
55 #include "views/layout/grid_layout.h" | |
56 | 56 |
57 using content::BrowserThread; | 57 using content::BrowserThread; |
58 using ui::ViewProp; | 58 using ui::ViewProp; |
59 | 59 |
60 static const char kWindowObjectKey[] = "ChromeWindowObject"; | 60 static const char kWindowObjectKey[] = "ChromeWindowObject"; |
61 | 61 |
62 namespace { | 62 namespace { |
63 | 63 |
64 // Convert ui::MenuModel into a serializable form for Chrome Frame | 64 // Convert ui::MenuModel into a serializable form for Chrome Frame |
65 ContextMenuModel* ConvertMenuModel(const ui::MenuModel* ui_model) { | 65 ContextMenuModel* ConvertMenuModel(const ui::MenuModel* ui_model) { |
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1175 if (params.disposition == CURRENT_TAB) { | 1175 if (params.disposition == CURRENT_TAB) { |
1176 DCHECK(route_all_top_level_navigations_); | 1176 DCHECK(route_all_top_level_navigations_); |
1177 forward_params.disposition = NEW_FOREGROUND_TAB; | 1177 forward_params.disposition = NEW_FOREGROUND_TAB; |
1178 } | 1178 } |
1179 TabContents* new_contents = | 1179 TabContents* new_contents = |
1180 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1180 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1181 // support only one navigation for a dummy tab before it is killed. | 1181 // support only one navigation for a dummy tab before it is killed. |
1182 ::DestroyWindow(GetNativeView()); | 1182 ::DestroyWindow(GetNativeView()); |
1183 return new_contents; | 1183 return new_contents; |
1184 } | 1184 } |
OLD | NEW |