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/external_tab/external_tab_container_win.h" | 5 #include "chrome/browser/external_tab/external_tab_container_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h
" | 61 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h
" |
62 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 62 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
63 #include "ui/base/l10n/l10n_util.h" | 63 #include "ui/base/l10n/l10n_util.h" |
64 #include "ui/base/models/menu_model.h" | 64 #include "ui/base/models/menu_model.h" |
65 #include "ui/base/view_prop.h" | 65 #include "ui/base/view_prop.h" |
66 #include "ui/views/controls/webview/webview.h" | 66 #include "ui/views/controls/webview/webview.h" |
67 #include "ui/views/layout/grid_layout.h" | 67 #include "ui/views/layout/grid_layout.h" |
68 | 68 |
69 using content::BrowserThread; | 69 using content::BrowserThread; |
70 using content::LoadNotificationDetails; | 70 using content::LoadNotificationDetails; |
| 71 using content::NativeWebKeyboardEvent; |
71 using content::NavigationController; | 72 using content::NavigationController; |
72 using content::NavigationEntry; | 73 using content::NavigationEntry; |
73 using content::OpenURLParams; | 74 using content::OpenURLParams; |
74 using content::RenderViewHost; | 75 using content::RenderViewHost; |
75 using content::SSLStatus; | 76 using content::SSLStatus; |
76 using content::WebContents; | 77 using content::WebContents; |
77 using ui::ViewProp; | 78 using ui::ViewProp; |
78 using WebKit::WebCString; | 79 using WebKit::WebCString; |
79 using WebKit::WebReferrerPolicy; | 80 using WebKit::WebReferrerPolicy; |
80 using WebKit::WebSecurityPolicy; | 81 using WebKit::WebSecurityPolicy; |
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1200 if (params.disposition == CURRENT_TAB) { | 1201 if (params.disposition == CURRENT_TAB) { |
1201 DCHECK(route_all_top_level_navigations_); | 1202 DCHECK(route_all_top_level_navigations_); |
1202 forward_params.disposition = NEW_FOREGROUND_TAB; | 1203 forward_params.disposition = NEW_FOREGROUND_TAB; |
1203 } | 1204 } |
1204 WebContents* new_contents = | 1205 WebContents* new_contents = |
1205 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1206 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
1206 // support only one navigation for a dummy tab before it is killed. | 1207 // support only one navigation for a dummy tab before it is killed. |
1207 ::DestroyWindow(GetNativeView()); | 1208 ::DestroyWindow(GetNativeView()); |
1208 return new_contents; | 1209 return new_contents; |
1209 } | 1210 } |
OLD | NEW |