Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool (Closed) Base URL: http://git.chromium.org/chromium/src.git@ngcolor
Patch Set: Used static class member Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <atlmisc.h> 10 #include <atlmisc.h>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/infobars/infobar_service.h" 31 #include "chrome/browser/infobars/infobar_service.h"
32 #include "chrome/browser/pepper_broker_infobar_delegate.h" 32 #include "chrome/browser/pepper_broker_infobar_delegate.h"
33 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/repost_form_warning_controller.h" 34 #include "chrome/browser/repost_form_warning_controller.h"
35 #include "chrome/browser/themes/theme_properties.h" 35 #include "chrome/browser/themes/theme_properties.h"
36 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 36 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
37 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 37 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
38 #include "chrome/browser/ui/browser.h" 38 #include "chrome/browser/ui/browser.h"
39 #include "chrome/browser/ui/browser_tab_contents.h" 39 #include "chrome/browser/ui/browser_tab_contents.h"
40 #include "chrome/browser/ui/browser_window.h" 40 #include "chrome/browser/ui/browser_window.h"
41 #include "chrome/browser/ui/color_chooser.h"
41 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 42 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
42 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 43 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
43 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 44 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
44 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" 45 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h"
45 #include "chrome/common/automation_messages.h" 46 #include "chrome/common/automation_messages.h"
46 #include "chrome/common/chrome_constants.h" 47 #include "chrome/common/chrome_constants.h"
47 #include "chrome/common/chrome_notification_types.h" 48 #include "chrome/common/chrome_notification_types.h"
48 #include "chrome/common/render_messages.h" 49 #include "chrome/common/render_messages.h"
49 #include "chrome/common/url_constants.h" 50 #include "chrome/common/url_constants.h"
50 #include "content/public/browser/load_notification_details.h" 51 #include "content/public/browser/load_notification_details.h"
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 unload_reply_message_ = NULL; 810 unload_reply_message_ = NULL;
810 *proceed_to_fire_unload = false; 811 *proceed_to_fire_unload = false;
811 } 812 }
812 } 813 }
813 814
814 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { 815 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) {
815 TabModalConfirmDialog::Create(new RepostFormWarningController(source), 816 TabModalConfirmDialog::Create(new RepostFormWarningController(source),
816 source); 817 source);
817 } 818 }
818 819
820 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser(
821 WebContents* web_contents, SkColor initial_color) {
822 return ColorChooser::Open(web_contents, initial_color);
823 }
824
819 void ExternalTabContainerWin::RunFileChooser( 825 void ExternalTabContainerWin::RunFileChooser(
820 WebContents* tab, 826 WebContents* tab,
821 const content::FileChooserParams& params) { 827 const content::FileChooserParams& params) {
822 FileSelectHelper::RunFileChooser(tab, params); 828 FileSelectHelper::RunFileChooser(tab, params);
823 } 829 }
824 830
825 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, 831 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab,
826 int request_id, 832 int request_id,
827 const base::FilePath& path) { 833 const base::FilePath& path) {
828 FileSelectHelper::EnumerateDirectory(tab, request_id, path); 834 FileSelectHelper::EnumerateDirectory(tab, request_id, path);
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 if (params.disposition == CURRENT_TAB) { 1305 if (params.disposition == CURRENT_TAB) {
1300 DCHECK(route_all_top_level_navigations_); 1306 DCHECK(route_all_top_level_navigations_);
1301 forward_params.disposition = NEW_FOREGROUND_TAB; 1307 forward_params.disposition = NEW_FOREGROUND_TAB;
1302 } 1308 }
1303 WebContents* new_contents = 1309 WebContents* new_contents =
1304 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1310 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1305 // support only one navigation for a dummy tab before it is killed. 1311 // support only one navigation for a dummy tab before it is killed.
1306 widget_->CloseNow(); 1312 widget_->CloseNow();
1307 return new_contents; 1313 return new_contents;
1308 } 1314 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698