| Index: chrome/browser/plugins/plugin_observer.cc
|
| diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
|
| index 7f1f3ff41a4c07a312aec0e4b4598eaa20377b8a..5c25720a7fb847b33d6cba10c58ccc44bc7f37d1 100644
|
| --- a/chrome/browser/plugins/plugin_observer.cc
|
| +++ b/chrome/browser/plugins/plugin_observer.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| +#include "chrome/browser/plugins/flash_download_interception.h"
|
| #include "chrome/browser/plugins/plugin_finder.h"
|
| #include "chrome/browser/plugins/plugin_infobar_delegates.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -33,6 +34,7 @@
|
| #include "components/infobars/core/infobar_delegate.h"
|
| #include "components/infobars/core/simple_alert_infobar_delegate.h"
|
| #include "components/metrics_services_manager/metrics_services_manager.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| @@ -454,7 +456,9 @@ void PluginObserver::OnOpenAboutPlugins() {
|
| }
|
|
|
| void PluginObserver::OnShowFlashPermissionBubble() {
|
| - // TODO(tommycli): Show a permission bubble for the associated tab.
|
| + DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| +
|
| + FlashDownloadInterception::ShowRunFlashPrompt(web_contents());
|
| }
|
|
|
| void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) {
|
|
|