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

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: Rebased Created 7 years, 7 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 21 matching lines...) Expand all
32 #include "chrome/browser/media/media_stream_infobar_delegate.h" 32 #include "chrome/browser/media/media_stream_infobar_delegate.h"
33 #include "chrome/browser/pepper_broker_infobar_delegate.h" 33 #include "chrome/browser/pepper_broker_infobar_delegate.h"
34 #include "chrome/browser/profiles/profile.h" 34 #include "chrome/browser/profiles/profile.h"
35 #include "chrome/browser/repost_form_warning_controller.h" 35 #include "chrome/browser/repost_form_warning_controller.h"
36 #include "chrome/browser/themes/theme_properties.h" 36 #include "chrome/browser/themes/theme_properties.h"
37 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 37 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
38 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 38 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
39 #include "chrome/browser/ui/browser.h" 39 #include "chrome/browser/ui/browser.h"
40 #include "chrome/browser/ui/browser_tab_contents.h" 40 #include "chrome/browser/ui/browser_tab_contents.h"
41 #include "chrome/browser/ui/browser_window.h" 41 #include "chrome/browser/ui/browser_window.h"
42 #include "chrome/browser/ui/color_chooser_util.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"
51 #include "content/public/browser/native_web_keyboard_event.h" 52 #include "content/public/browser/native_web_keyboard_event.h"
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 unload_reply_message_ = NULL; 826 unload_reply_message_ = NULL;
826 *proceed_to_fire_unload = false; 827 *proceed_to_fire_unload = false;
827 } 828 }
828 } 829 }
829 830
830 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { 831 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) {
831 TabModalConfirmDialog::Create(new RepostFormWarningController(source), 832 TabModalConfirmDialog::Create(new RepostFormWarningController(source),
832 source); 833 source);
833 } 834 }
834 835
836 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser(
837 WebContents* web_contents, SkColor initial_color) {
838 return ::OpenColorChooser(web_contents, initial_color);
839 }
840
835 void ExternalTabContainerWin::RunFileChooser( 841 void ExternalTabContainerWin::RunFileChooser(
836 WebContents* tab, 842 WebContents* tab,
837 const content::FileChooserParams& params) { 843 const content::FileChooserParams& params) {
838 FileSelectHelper::RunFileChooser(tab, params); 844 FileSelectHelper::RunFileChooser(tab, params);
839 } 845 }
840 846
841 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, 847 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab,
842 int request_id, 848 int request_id,
843 const base::FilePath& path) { 849 const base::FilePath& path) {
844 FileSelectHelper::EnumerateDirectory(tab, request_id, path); 850 FileSelectHelper::EnumerateDirectory(tab, request_id, path);
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 if (params.disposition == CURRENT_TAB) { 1314 if (params.disposition == CURRENT_TAB) {
1309 DCHECK(route_all_top_level_navigations_); 1315 DCHECK(route_all_top_level_navigations_);
1310 forward_params.disposition = NEW_FOREGROUND_TAB; 1316 forward_params.disposition = NEW_FOREGROUND_TAB;
1311 } 1317 }
1312 WebContents* new_contents = 1318 WebContents* new_contents =
1313 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1319 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1314 // support only one navigation for a dummy tab before it is killed. 1320 // support only one navigation for a dummy tab before it is killed.
1315 widget_->CloseNow(); 1321 widget_->CloseNow();
1316 return new_contents; 1322 return new_contents;
1317 } 1323 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698