| 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> |
| (...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 *proceed_to_fire_unload = false; | 988 *proceed_to_fire_unload = false; |
| 989 } | 989 } |
| 990 } | 990 } |
| 991 | 991 |
| 992 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { | 992 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { |
| 993 TabModalConfirmDialog::Create(new RepostFormWarningController(source), | 993 TabModalConfirmDialog::Create(new RepostFormWarningController(source), |
| 994 source); | 994 source); |
| 995 } | 995 } |
| 996 | 996 |
| 997 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser( | 997 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser( |
| 998 WebContents* web_contents, SkColor initial_color) { | 998 WebContents* web_contents, |
| 999 SkColor initial_color, |
| 1000 const std::vector<content::ColorSuggestion>& suggestions) { |
| 999 return chrome::ShowColorChooser(web_contents, initial_color); | 1001 return chrome::ShowColorChooser(web_contents, initial_color); |
| 1000 } | 1002 } |
| 1001 | 1003 |
| 1002 void ExternalTabContainerWin::RunFileChooser( | 1004 void ExternalTabContainerWin::RunFileChooser( |
| 1003 WebContents* tab, | 1005 WebContents* tab, |
| 1004 const content::FileChooserParams& params) { | 1006 const content::FileChooserParams& params) { |
| 1005 FileSelectHelper::RunFileChooser(tab, params); | 1007 FileSelectHelper::RunFileChooser(tab, params); |
| 1006 } | 1008 } |
| 1007 | 1009 |
| 1008 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, | 1010 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1479 if (params.disposition == CURRENT_TAB) { | 1481 if (params.disposition == CURRENT_TAB) { |
| 1480 DCHECK(route_all_top_level_navigations_); | 1482 DCHECK(route_all_top_level_navigations_); |
| 1481 forward_params.disposition = NEW_FOREGROUND_TAB; | 1483 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 1482 } | 1484 } |
| 1483 WebContents* new_contents = | 1485 WebContents* new_contents = |
| 1484 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); | 1486 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); |
| 1485 // support only one navigation for a dummy tab before it is killed. | 1487 // support only one navigation for a dummy tab before it is killed. |
| 1486 widget_->CloseNow(); | 1488 widget_->CloseNow(); |
| 1487 return new_contents; | 1489 return new_contents; |
| 1488 } | 1490 } |
| OLD | NEW |