| 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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 } | 582 } |
| 583 | 583 |
| 584 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { | 584 content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() { |
| 585 if (!dialog_manager_) { | 585 if (!dialog_manager_) { |
| 586 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); | 586 dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this)); |
| 587 } | 587 } |
| 588 return dialog_manager_.get(); | 588 return dialog_manager_.get(); |
| 589 } | 589 } |
| 590 | 590 |
| 591 content::ColorChooser* ExtensionHost::OpenColorChooser( | 591 content::ColorChooser* ExtensionHost::OpenColorChooser( |
| 592 WebContents* web_contents, SkColor initial_color) { | 592 WebContents* web_contents, |
| 593 SkColor initial_color, |
| 594 const std::vector<SkColor>& suggestions, |
| 595 const std::vector<string16>& suggestion_labels) { |
| 593 return chrome::ShowColorChooser(web_contents, initial_color); | 596 return chrome::ShowColorChooser(web_contents, initial_color); |
| 594 } | 597 } |
| 595 | 598 |
| 596 void ExtensionHost::RunFileChooser(WebContents* tab, | 599 void ExtensionHost::RunFileChooser(WebContents* tab, |
| 597 const content::FileChooserParams& params) { | 600 const content::FileChooserParams& params) { |
| 598 FileSelectHelper::RunFileChooser(tab, params); | 601 FileSelectHelper::RunFileChooser(tab, params); |
| 599 } | 602 } |
| 600 | 603 |
| 601 void ExtensionHost::AddNewContents(WebContents* source, | 604 void ExtensionHost::AddNewContents(WebContents* source, |
| 602 WebContents* new_contents, | 605 WebContents* new_contents, |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 640 | 643 |
| 641 void ExtensionHost::RequestMediaAccessPermission( | 644 void ExtensionHost::RequestMediaAccessPermission( |
| 642 content::WebContents* web_contents, | 645 content::WebContents* web_contents, |
| 643 const content::MediaStreamRequest& request, | 646 const content::MediaStreamRequest& request, |
| 644 const content::MediaResponseCallback& callback) { | 647 const content::MediaResponseCallback& callback) { |
| 645 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( | 648 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( |
| 646 web_contents, request, callback, extension()); | 649 web_contents, request, callback, extension()); |
| 647 } | 650 } |
| 648 | 651 |
| 649 } // namespace extensions | 652 } // namespace extensions |
| OLD | NEW |