| 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_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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 #include "ui/base/l10n/l10n_util.h" | 66 #include "ui/base/l10n/l10n_util.h" |
| 67 #include "ui/base/models/menu_model.h" | 67 #include "ui/base/models/menu_model.h" |
| 68 #include "ui/base/view_prop.h" | 68 #include "ui/base/view_prop.h" |
| 69 #include "ui/views/layout/grid_layout.h" | 69 #include "ui/views/layout/grid_layout.h" |
| 70 | 70 |
| 71 using content::BrowserThread; | 71 using content::BrowserThread; |
| 72 using content::NavigationController; | 72 using content::NavigationController; |
| 73 using content::NavigationEntry; | 73 using content::NavigationEntry; |
| 74 using content::OpenURLParams; | 74 using content::OpenURLParams; |
| 75 using content::SSLStatus; | 75 using content::SSLStatus; |
| 76 using content::RenderViewHost; |
| 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::WebString; | 80 using WebKit::WebString; |
| 80 using WebKit::WebReferrerPolicy; | 81 using WebKit::WebReferrerPolicy; |
| 81 using WebKit::WebSecurityPolicy; | 82 using WebKit::WebSecurityPolicy; |
| 82 | 83 |
| 83 static const char kWindowObjectKey[] = "ChromeWindowObject"; | 84 static const char kWindowObjectKey[] = "ChromeWindowObject"; |
| 84 | 85 |
| 85 namespace { | 86 namespace { |
| (...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1207 if (params.disposition == CURRENT_TAB) { | 1208 if (params.disposition == CURRENT_TAB) { |
| 1208 DCHECK(route_all_top_level_navigations_); | 1209 DCHECK(route_all_top_level_navigations_); |
| 1209 forward_params.disposition = NEW_FOREGROUND_TAB; | 1210 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 1210 } | 1211 } |
| 1211 WebContents* new_contents = | 1212 WebContents* new_contents = |
| 1212 ExternalTabContainer::OpenURLFromTab(source, forward_params); | 1213 ExternalTabContainer::OpenURLFromTab(source, forward_params); |
| 1213 // support only one navigation for a dummy tab before it is killed. | 1214 // support only one navigation for a dummy tab before it is killed. |
| 1214 ::DestroyWindow(GetNativeView()); | 1215 ::DestroyWindow(GetNativeView()); |
| 1215 return new_contents; | 1216 return new_contents; |
| 1216 } | 1217 } |
| OLD | NEW |