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

Side by Side Diff: chrome/browser/extensions/extension_host.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: 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/extensions/extension_host.h" 5 #include "chrome/browser/extensions/extension_host.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/extensions/extension_tab_util.h" 21 #include "chrome/browser/extensions/extension_tab_util.h"
22 #include "chrome/browser/extensions/window_controller.h" 22 #include "chrome/browser/extensions/window_controller.h"
23 #include "chrome/browser/file_select_helper.h" 23 #include "chrome/browser/file_select_helper.h"
24 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 24 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
25 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 26 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
27 #include "chrome/browser/ui/browser.h" 27 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/browser_finder.h" 28 #include "chrome/browser/ui/browser_finder.h"
29 #include "chrome/browser/ui/browser_list.h" 29 #include "chrome/browser/ui/browser_list.h"
30 #include "chrome/browser/ui/browser_window.h" 30 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/color_chooser_controller.h"
31 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 32 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
32 #include "chrome/browser/view_type_utils.h" 33 #include "chrome/browser/view_type_utils.h"
33 #include "chrome/common/chrome_constants.h" 34 #include "chrome/common/chrome_constants.h"
34 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
35 #include "chrome/common/extensions/background_info.h" 36 #include "chrome/common/extensions/background_info.h"
36 #include "chrome/common/extensions/extension.h" 37 #include "chrome/common/extensions/extension.h"
37 #include "chrome/common/extensions/extension_constants.h" 38 #include "chrome/common/extensions/extension_constants.h"
38 #include "chrome/common/extensions/extension_messages.h" 39 #include "chrome/common/extensions/extension_messages.h"
39 #include "chrome/common/extensions/feature_switch.h" 40 #include "chrome/common/extensions/feature_switch.h"
40 #include "chrome/common/extensions/request_media_access_permission_helper.h" 41 #include "chrome/common/extensions/request_media_access_permission_helper.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 render_view_host_ = host_contents_->GetRenderViewHost(); 571 render_view_host_ = host_contents_->GetRenderViewHost();
571 } 572 }
572 573
573 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { 574 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() {
574 if (!dialog_manager_.get()) { 575 if (!dialog_manager_.get()) {
575 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); 576 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this));
576 } 577 }
577 return dialog_manager_.get(); 578 return dialog_manager_.get();
578 } 579 }
579 580
581 content::ColorChooser* ExtensionHost::OpenColorChooser(
582 WebContents* web_contents, int color_chooser_id, SkColor color) {
583 return ColorChooserController::GetInstance()->OpenColorChooser(
584 color, web_contents, color_chooser_id);
585 }
586
580 void ExtensionHost::RunFileChooser(WebContents* tab, 587 void ExtensionHost::RunFileChooser(WebContents* tab,
581 const content::FileChooserParams& params) { 588 const content::FileChooserParams& params) {
582 FileSelectHelper::RunFileChooser(tab, params); 589 FileSelectHelper::RunFileChooser(tab, params);
583 } 590 }
584 591
585 void ExtensionHost::AddNewContents(WebContents* source, 592 void ExtensionHost::AddNewContents(WebContents* source,
586 WebContents* new_contents, 593 WebContents* new_contents,
587 WindowOpenDisposition disposition, 594 WindowOpenDisposition disposition,
588 const gfx::Rect& initial_pos, 595 const gfx::Rect& initial_pos,
589 bool user_gesture, 596 bool user_gesture,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 content::IsAudioMediaType(request.audio_type), 640 content::IsAudioMediaType(request.audio_type),
634 content::IsVideoMediaType(request.video_type), 641 content::IsVideoMediaType(request.video_type),
635 &devices); 642 &devices);
636 643
637 // For tab capture device, we require the tabCapture permission. 644 // For tab capture device, we require the tabCapture permission.
638 RequestMediaAccessPermissionHelper::AuthorizeRequest( 645 RequestMediaAccessPermissionHelper::AuthorizeRequest(
639 devices, request, callback, extension(), false); 646 devices, request, callback, extension(), false);
640 } 647 }
641 648
642 } // namespace extensions 649 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698