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

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: Removed chrome/browser/ui/color_chooser.cc 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 20 matching lines...) Expand all
31 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 31 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
32 #include "chrome/common/chrome_constants.h" 32 #include "chrome/common/chrome_constants.h"
33 #include "chrome/common/chrome_notification_types.h" 33 #include "chrome/common/chrome_notification_types.h"
34 #include "chrome/common/extensions/background_info.h" 34 #include "chrome/common/extensions/background_info.h"
35 #include "chrome/common/extensions/extension.h" 35 #include "chrome/common/extensions/extension.h"
36 #include "chrome/common/extensions/extension_constants.h" 36 #include "chrome/common/extensions/extension_constants.h"
37 #include "chrome/common/extensions/extension_messages.h" 37 #include "chrome/common/extensions/extension_messages.h"
38 #include "chrome/common/extensions/feature_switch.h" 38 #include "chrome/common/extensions/feature_switch.h"
39 #include "chrome/common/render_messages.h" 39 #include "chrome/common/render_messages.h"
40 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
41 #include "content/public/browser/color_chooser.h"
41 #include "content/public/browser/content_browser_client.h" 42 #include "content/public/browser/content_browser_client.h"
42 #include "content/public/browser/native_web_keyboard_event.h" 43 #include "content/public/browser/native_web_keyboard_event.h"
43 #include "content/public/browser/notification_service.h" 44 #include "content/public/browser/notification_service.h"
44 #include "content/public/browser/render_process_host.h" 45 #include "content/public/browser/render_process_host.h"
45 #include "content/public/browser/render_view_host.h" 46 #include "content/public/browser/render_view_host.h"
46 #include "content/public/browser/site_instance.h" 47 #include "content/public/browser/site_instance.h"
47 #include "content/public/browser/web_contents.h" 48 #include "content/public/browser/web_contents.h"
48 #include "content/public/browser/web_contents_view.h" 49 #include "content/public/browser/web_contents_view.h"
49 #include "extensions/browser/view_type_utils.h" 50 #include "extensions/browser/view_type_utils.h"
50 #include "grit/browser_resources.h" 51 #include "grit/browser_resources.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 render_view_host_ = host_contents_->GetRenderViewHost(); 568 render_view_host_ = host_contents_->GetRenderViewHost();
568 } 569 }
569 570
570 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { 571 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() {
571 if (!dialog_manager_) { 572 if (!dialog_manager_) {
572 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); 573 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this));
573 } 574 }
574 return dialog_manager_.get(); 575 return dialog_manager_.get();
575 } 576 }
576 577
578 content::ColorChooser* ExtensionHost::OpenColorChooser(
579 WebContents* web_contents, SkColor initial_color) {
580 return content::ColorChooser::Open(web_contents, initial_color);
581 }
582
577 void ExtensionHost::RunFileChooser(WebContents* tab, 583 void ExtensionHost::RunFileChooser(WebContents* tab,
578 const content::FileChooserParams& params) { 584 const content::FileChooserParams& params) {
579 FileSelectHelper::RunFileChooser(tab, params); 585 FileSelectHelper::RunFileChooser(tab, params);
580 } 586 }
581 587
582 void ExtensionHost::AddNewContents(WebContents* source, 588 void ExtensionHost::AddNewContents(WebContents* source,
583 WebContents* new_contents, 589 WebContents* new_contents,
584 WindowOpenDisposition disposition, 590 WindowOpenDisposition disposition,
585 const gfx::Rect& initial_pos, 591 const gfx::Rect& initial_pos,
586 bool user_gesture, 592 bool user_gesture,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 627
622 void ExtensionHost::RequestMediaAccessPermission( 628 void ExtensionHost::RequestMediaAccessPermission(
623 content::WebContents* web_contents, 629 content::WebContents* web_contents,
624 const content::MediaStreamRequest& request, 630 const content::MediaStreamRequest& request,
625 const content::MediaResponseCallback& callback) { 631 const content::MediaResponseCallback& callback) {
626 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( 632 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
627 web_contents, request, callback, extension()); 633 web_contents, request, callback, extension());
628 } 634 }
629 635
630 } // namespace extensions 636 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698