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

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: 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/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.h"
31 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 32 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
32 #include "chrome/common/chrome_constants.h" 33 #include "chrome/common/chrome_constants.h"
33 #include "chrome/common/chrome_notification_types.h" 34 #include "chrome/common/chrome_notification_types.h"
34 #include "chrome/common/extensions/background_info.h" 35 #include "chrome/common/extensions/background_info.h"
35 #include "chrome/common/extensions/extension.h" 36 #include "chrome/common/extensions/extension.h"
36 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
37 #include "chrome/common/extensions/extension_messages.h" 38 #include "chrome/common/extensions/extension_messages.h"
38 #include "chrome/common/extensions/feature_switch.h" 39 #include "chrome/common/extensions/feature_switch.h"
39 #include "chrome/common/extensions/request_media_access_permission_helper.h" 40 #include "chrome/common/extensions/request_media_access_permission_helper.h"
40 #include "chrome/common/render_messages.h" 41 #include "chrome/common/render_messages.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 render_view_host_ = host_contents_->GetRenderViewHost(); 569 render_view_host_ = host_contents_->GetRenderViewHost();
569 } 570 }
570 571
571 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { 572 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() {
572 if (!dialog_manager_.get()) { 573 if (!dialog_manager_.get()) {
573 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); 574 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this));
574 } 575 }
575 return dialog_manager_.get(); 576 return dialog_manager_.get();
576 } 577 }
577 578
579 content::ColorChooser* ExtensionHost::OpenColorChooser(
580 WebContents* web_contents, SkColor initial_color) {
581 return ColorChooser::Open(web_contents, initial_color);
582 }
583
578 void ExtensionHost::RunFileChooser(WebContents* tab, 584 void ExtensionHost::RunFileChooser(WebContents* tab,
579 const content::FileChooserParams& params) { 585 const content::FileChooserParams& params) {
580 FileSelectHelper::RunFileChooser(tab, params); 586 FileSelectHelper::RunFileChooser(tab, params);
581 } 587 }
582 588
583 void ExtensionHost::AddNewContents(WebContents* source, 589 void ExtensionHost::AddNewContents(WebContents* source,
584 WebContents* new_contents, 590 WebContents* new_contents,
585 WindowOpenDisposition disposition, 591 WindowOpenDisposition disposition,
586 const gfx::Rect& initial_pos, 592 const gfx::Rect& initial_pos,
587 bool user_gesture, 593 bool user_gesture,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 content::IsAudioMediaType(request.audio_type), 637 content::IsAudioMediaType(request.audio_type),
632 content::IsVideoMediaType(request.video_type), 638 content::IsVideoMediaType(request.video_type),
633 &devices); 639 &devices);
634 640
635 // For tab capture device, we require the tabCapture permission. 641 // For tab capture device, we require the tabCapture permission.
636 RequestMediaAccessPermissionHelper::AuthorizeRequest( 642 RequestMediaAccessPermissionHelper::AuthorizeRequest(
637 devices, request, callback, extension(), false); 643 devices, request, callback, extension(), false);
638 } 644 }
639 645
640 } // namespace extensions 646 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698