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 981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
992 *proceed_to_fire_unload = false; | 992 *proceed_to_fire_unload = false; |
993 } | 993 } |
994 } | 994 } |
995 | 995 |
996 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { | 996 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { |
997 TabModalConfirmDialog::Create(new RepostFormWarningController(source), | 997 TabModalConfirmDialog::Create(new RepostFormWarningController(source), |
998 source); | 998 source); |
999 } | 999 } |
1000 | 1000 |
1001 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser( | 1001 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser( |
1002 WebContents* web_contents, SkColor initial_color) { | 1002 WebContents* web_contents, |
| 1003 SkColor initial_color, |
| 1004 const std::vector<SkColor>& suggestions, |
| 1005 const std::vector<string16>& suggestion_labels) { |
1003 return chrome::ShowColorChooser(web_contents, initial_color); | 1006 return chrome::ShowColorChooser(web_contents, initial_color); |
1004 } | 1007 } |
1005 | 1008 |
1006 void ExternalTabContainerWin::RunFileChooser( | 1009 void ExternalTabContainerWin::RunFileChooser( |
1007 WebContents* tab, | 1010 WebContents* tab, |
1008 const content::FileChooserParams& params) { | 1011 const content::FileChooserParams& params) { |
1009 FileSelectHelper::RunFileChooser(tab, params); | 1012 FileSelectHelper::RunFileChooser(tab, params); |
1010 } | 1013 } |
1011 | 1014 |
1012 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, | 1015 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, |
(...skipping 469 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 |