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

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: Fixed android build 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
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/history/history_types.h" 31 #include "chrome/browser/history/history_types.h"
32 #include "chrome/browser/infobars/infobar_service.h" 32 #include "chrome/browser/infobars/infobar_service.h"
33 #include "chrome/browser/media/media_stream_infobar_delegate.h" 33 #include "chrome/browser/media/media_stream_infobar_delegate.h"
34 #include "chrome/browser/pepper_broker_infobar_delegate.h" 34 #include "chrome/browser/pepper_broker_infobar_delegate.h"
35 #include "chrome/browser/profiles/profile.h" 35 #include "chrome/browser/profiles/profile.h"
36 #include "chrome/browser/repost_form_warning_controller.h" 36 #include "chrome/browser/repost_form_warning_controller.h"
37 #include "chrome/browser/themes/theme_properties.h" 37 #include "chrome/browser/themes/theme_properties.h"
38 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 38 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
39 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 39 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
40 #include "chrome/browser/ui/browser.h" 40 #include "chrome/browser/ui/browser.h"
41 #include "chrome/browser/ui/browser_dialogs.h"
41 #include "chrome/browser/ui/browser_tab_contents.h" 42 #include "chrome/browser/ui/browser_tab_contents.h"
42 #include "chrome/browser/ui/browser_window.h" 43 #include "chrome/browser/ui/browser_window.h"
43 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 44 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
44 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 45 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
45 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h" 46 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_win.h"
46 #include "chrome/common/automation_messages.h" 47 #include "chrome/common/automation_messages.h"
47 #include "chrome/common/chrome_constants.h" 48 #include "chrome/common/chrome_constants.h"
48 #include "chrome/common/chrome_notification_types.h" 49 #include "chrome/common/chrome_notification_types.h"
49 #include "chrome/common/render_messages.h" 50 #include "chrome/common/render_messages.h"
50 #include "chrome/common/url_constants.h" 51 #include "chrome/common/url_constants.h"
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 unload_reply_message_ = NULL; 915 unload_reply_message_ = NULL;
915 *proceed_to_fire_unload = false; 916 *proceed_to_fire_unload = false;
916 } 917 }
917 } 918 }
918 919
919 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) { 920 void ExternalTabContainerWin::ShowRepostFormWarningDialog(WebContents* source) {
920 TabModalConfirmDialog::Create(new RepostFormWarningController(source), 921 TabModalConfirmDialog::Create(new RepostFormWarningController(source),
921 source); 922 source);
922 } 923 }
923 924
925 content::ColorChooser* ExternalTabContainerWin::OpenColorChooser(
926 WebContents* web_contents, SkColor initial_color) {
927 return chrome::ShowColorChooser(web_contents, initial_color);
928 }
929
924 void ExternalTabContainerWin::RunFileChooser( 930 void ExternalTabContainerWin::RunFileChooser(
925 WebContents* tab, 931 WebContents* tab,
926 const content::FileChooserParams& params) { 932 const content::FileChooserParams& params) {
927 FileSelectHelper::RunFileChooser(tab, params); 933 FileSelectHelper::RunFileChooser(tab, params);
928 } 934 }
929 935
930 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab, 936 void ExternalTabContainerWin::EnumerateDirectory(WebContents* tab,
931 int request_id, 937 int request_id,
932 const base::FilePath& path) { 938 const base::FilePath& path) {
933 FileSelectHelper::EnumerateDirectory(tab, request_id, path); 939 FileSelectHelper::EnumerateDirectory(tab, request_id, path);
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 if (params.disposition == CURRENT_TAB) { 1403 if (params.disposition == CURRENT_TAB) {
1398 DCHECK(route_all_top_level_navigations_); 1404 DCHECK(route_all_top_level_navigations_);
1399 forward_params.disposition = NEW_FOREGROUND_TAB; 1405 forward_params.disposition = NEW_FOREGROUND_TAB;
1400 } 1406 }
1401 WebContents* new_contents = 1407 WebContents* new_contents =
1402 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1408 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1403 // support only one navigation for a dummy tab before it is killed. 1409 // support only one navigation for a dummy tab before it is killed.
1404 widget_->CloseNow(); 1410 widget_->CloseNow();
1405 return new_contents; 1411 return new_contents;
1406 } 1412 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698