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/logging.h" | 10 #include "base/logging.h" |
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 } | 651 } |
652 | 652 |
653 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { | 653 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { |
654 if (!dialog_manager_) { | 654 if (!dialog_manager_) { |
655 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); | 655 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); |
656 } | 656 } |
657 return dialog_manager_.get(); | 657 return dialog_manager_.get(); |
658 } | 658 } |
659 | 659 |
660 content::ColorChooser* ExtensionHost::OpenColorChooser( | 660 content::ColorChooser* ExtensionHost::OpenColorChooser( |
661 WebContents* web_contents, SkColor initial_color) { | 661 WebContents* web_contents, |
| 662 SkColor initial_color, |
| 663 const std::vector<content::ColorSuggestion>& suggestions) { |
662 return chrome::ShowColorChooser(web_contents, initial_color); | 664 return chrome::ShowColorChooser(web_contents, initial_color); |
663 } | 665 } |
664 | 666 |
665 void ExtensionHost::RunFileChooser(WebContents* tab, | 667 void ExtensionHost::RunFileChooser(WebContents* tab, |
666 const content::FileChooserParams& params) { | 668 const content::FileChooserParams& params) { |
667 FileSelectHelper::RunFileChooser(tab, params); | 669 FileSelectHelper::RunFileChooser(tab, params); |
668 } | 670 } |
669 | 671 |
670 void ExtensionHost::AddNewContents(WebContents* source, | 672 void ExtensionHost::AddNewContents(WebContents* source, |
671 WebContents* new_contents, | 673 WebContents* new_contents, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 | 711 |
710 void ExtensionHost::RequestMediaAccessPermission( | 712 void ExtensionHost::RequestMediaAccessPermission( |
711 content::WebContents* web_contents, | 713 content::WebContents* web_contents, |
712 const content::MediaStreamRequest& request, | 714 const content::MediaStreamRequest& request, |
713 const content::MediaResponseCallback& callback) { | 715 const content::MediaResponseCallback& callback) { |
714 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( | 716 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( |
715 web_contents, request, callback, extension()); | 717 web_contents, request, callback, extension()); |
716 } | 718 } |
717 | 719 |
718 } // namespace extensions | 720 } // namespace extensions |
OLD | NEW |