OLD | NEW |
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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 } | 611 } |
612 | 612 |
613 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { | 613 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { |
614 if (!dialog_manager_) { | 614 if (!dialog_manager_) { |
615 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); | 615 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); |
616 } | 616 } |
617 return dialog_manager_.get(); | 617 return dialog_manager_.get(); |
618 } | 618 } |
619 | 619 |
620 content::ColorChooser* ExtensionHost::OpenColorChooser( | 620 content::ColorChooser* ExtensionHost::OpenColorChooser( |
621 WebContents* web_contents, SkColor initial_color) { | 621 WebContents* web_contents, |
| 622 SkColor initial_color, |
| 623 const std::vector<SkColor>& suggestions, |
| 624 const std::vector<string16>& suggestion_labels) { |
622 return chrome::ShowColorChooser(web_contents, initial_color); | 625 return chrome::ShowColorChooser(web_contents, initial_color); |
623 } | 626 } |
624 | 627 |
625 void ExtensionHost::RunFileChooser(WebContents* tab, | 628 void ExtensionHost::RunFileChooser(WebContents* tab, |
626 const content::FileChooserParams& params) { | 629 const content::FileChooserParams& params) { |
627 FileSelectHelper::RunFileChooser(tab, params); | 630 FileSelectHelper::RunFileChooser(tab, params); |
628 } | 631 } |
629 | 632 |
630 void ExtensionHost::AddNewContents(WebContents* source, | 633 void ExtensionHost::AddNewContents(WebContents* source, |
631 WebContents* new_contents, | 634 WebContents* new_contents, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 | 672 |
670 void ExtensionHost::RequestMediaAccessPermission( | 673 void ExtensionHost::RequestMediaAccessPermission( |
671 content::WebContents* web_contents, | 674 content::WebContents* web_contents, |
672 const content::MediaStreamRequest& request, | 675 const content::MediaStreamRequest& request, |
673 const content::MediaResponseCallback& callback) { | 676 const content::MediaResponseCallback& callback) { |
674 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( | 677 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( |
675 web_contents, request, callback, extension()); | 678 web_contents, request, callback, extension()); |
676 } | 679 } |
677 | 680 |
678 } // namespace extensions | 681 } // namespace extensions |
OLD | NEW |