Commit 8447f80e authored by tommycli's avatar tommycli Committed by Commit bot

[HBD] Plumb the no-fallback placeholder click into the browser process.

BUG=641626

Review-Url: https://codereview.chromium.org/2352393004
Cr-Commit-Position: refs/heads/master@{#420649}
parent a575a3f2
...@@ -379,6 +379,8 @@ bool PluginObserver::OnMessageReceived( ...@@ -379,6 +379,8 @@ bool PluginObserver::OnMessageReceived(
#endif #endif
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_OpenAboutPlugins, IPC_MESSAGE_HANDLER(ChromeViewHostMsg_OpenAboutPlugins,
OnOpenAboutPlugins) OnOpenAboutPlugins)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowFlashPermissionBubble,
OnShowFlashPermissionBubble)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CouldNotLoadPlugin, IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CouldNotLoadPlugin,
OnCouldNotLoadPlugin) OnCouldNotLoadPlugin)
...@@ -451,6 +453,10 @@ void PluginObserver::OnOpenAboutPlugins() { ...@@ -451,6 +453,10 @@ void PluginObserver::OnOpenAboutPlugins() {
ui::PAGE_TRANSITION_AUTO_BOOKMARK, false)); ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
} }
void PluginObserver::OnShowFlashPermissionBubble() {
// TODO(tommycli): Show a permission bubble for the associated tab.
}
void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) { void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) {
g_browser_process->GetMetricsServicesManager()->OnPluginLoadingError( g_browser_process->GetMetricsServicesManager()->OnPluginLoadingError(
plugin_path); plugin_path);
......
...@@ -65,6 +65,7 @@ class PluginObserver : public content::WebContentsObserver, ...@@ -65,6 +65,7 @@ class PluginObserver : public content::WebContentsObserver,
#endif #endif
void RemoveComponentObserver(int placeholder_id); void RemoveComponentObserver(int placeholder_id);
void OnOpenAboutPlugins(); void OnOpenAboutPlugins();
void OnShowFlashPermissionBubble();
void OnCouldNotLoadPlugin(const base::FilePath& plugin_path); void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
#if defined(ENABLE_PLUGIN_INSTALLATION) #if defined(ENABLE_PLUGIN_INSTALLATION)
......
...@@ -424,6 +424,9 @@ IPC_MESSAGE_ROUTED0(ChromeViewMsg_CancelledDownloadingPlugin) ...@@ -424,6 +424,9 @@ IPC_MESSAGE_ROUTED0(ChromeViewMsg_CancelledDownloadingPlugin)
// chrome:// URLs. // chrome:// URLs.
IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_OpenAboutPlugins) IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_OpenAboutPlugins)
// Tells the browser to show the Flash permission bubble in the same tab.
IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_ShowFlashPermissionBubble)
// Tells the browser that there was an error loading a plugin. // Tells the browser that there was an error loading a plugin.
IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_CouldNotLoadPlugin, IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_CouldNotLoadPlugin,
base::FilePath /* plugin_path */) base::FilePath /* plugin_path */)
......
...@@ -225,7 +225,8 @@ void ChromePluginPlaceholder::OpenAboutPluginsCallback() { ...@@ -225,7 +225,8 @@ void ChromePluginPlaceholder::OpenAboutPluginsCallback() {
} }
void ChromePluginPlaceholder::ShowPermissionBubbleCallback() { void ChromePluginPlaceholder::ShowPermissionBubbleCallback() {
// TODO(tommycli): Show a permission bubble in the browser process. RenderThread::Get()->Send(
new ChromeViewHostMsg_ShowFlashPermissionBubble(routing_id()));
} }
#if defined(ENABLE_PLUGIN_INSTALLATION) #if defined(ENABLE_PLUGIN_INSTALLATION)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment