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