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 <atlcrack.h> | 10 #include <atlcrack.h> |
11 #include <atlmisc.h> | 11 #include <atlmisc.h> |
12 #include <string> | 12 #include <string> |
13 | 13 |
14 #include "base/bind.h" | 14 #include "base/bind.h" |
15 #include "base/bind_helpers.h" | 15 #include "base/bind_helpers.h" |
16 #include "base/debug/trace_event.h" | 16 #include "base/debug/trace_event.h" |
17 #include "base/i18n/rtl.h" | 17 #include "base/i18n/rtl.h" |
18 #include "base/logging.h" | 18 #include "base/logging.h" |
19 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
20 #include "base/string16.h" | 20 #include "base/string16.h" |
| 21 #include "base/strings/utf_string_conversions.h" |
21 #include "base/time.h" | 22 #include "base/time.h" |
22 #include "base/utf_string_conversions.h" | |
23 #include "base/win/win_util.h" | 23 #include "base/win/win_util.h" |
24 #include "chrome/app/chrome_command_ids.h" | 24 #include "chrome/app/chrome_command_ids.h" |
25 #include "chrome/app/chrome_dll_resource.h" | 25 #include "chrome/app/chrome_dll_resource.h" |
26 #include "chrome/browser/automation/automation_provider.h" | 26 #include "chrome/browser/automation/automation_provider.h" |
27 #include "chrome/browser/devtools/devtools_toggle_action.h" | 27 #include "chrome/browser/devtools/devtools_toggle_action.h" |
28 #include "chrome/browser/devtools/devtools_window.h" | 28 #include "chrome/browser/devtools/devtools_window.h" |
29 #include "chrome/browser/file_select_helper.h" | 29 #include "chrome/browser/file_select_helper.h" |
30 #include "chrome/browser/history/history_tab_helper.h" | 30 #include "chrome/browser/history/history_tab_helper.h" |
31 #include "chrome/browser/history/history_types.h" | 31 #include "chrome/browser/history/history_types.h" |
32 #include "chrome/browser/infobars/infobar_service.h" | 32 #include "chrome/browser/infobars/infobar_service.h" |
(...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1444 if (params.disposition == CURRENT_TAB) { | 1444 if (params.disposition == CURRENT_TAB) { |
1445 DCHECK(route_all_top_level_navigations_); | 1445 DCHECK(route_all_top_level_navigations_); |
1446 forward_params.disposition = NEW_FOREGROUND_TAB; | 1446 forward_params.disposition = NEW_FOREGROUND_TAB; |
1447 } | 1447 } |
1448 WebContents* new_contents = | 1448 WebContents* new_contents = |
1449 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); | 1449 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); |
1450 // support only one navigation for a dummy tab before it is killed. | 1450 // support only one navigation for a dummy tab before it is killed. |
1451 widget_->CloseNow(); | 1451 widget_->CloseNow(); |
1452 return new_contents; | 1452 return new_contents; |
1453 } | 1453 } |
OLD | NEW |