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