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