Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1466)

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 688343003: Add some missing ENABLE_PLUGINS ifdefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 3ee4b77be6534dd5f0f5d76907209ccb93614b07..f4adecbd4e82ce5e061812dab75466bd71129368 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -723,10 +723,6 @@ class CONTENT_EXPORT WebContentsImpl
bool success,
const base::string16& user_input);
- // Callback function when requesting permission to access the PPAPI broker.
- // |result| is true if permission was granted.
- void OnPpapiBrokerPermissionResult(int routing_id, bool result);
-
bool OnMessageReceived(RenderViewHost* render_view_host,
RenderFrameHost* render_frame_host,
const IPC::Message& message);
@@ -771,11 +767,6 @@ class CONTENT_EXPORT WebContentsImpl
void OnOpenDateTimeDialog(
const ViewHostMsg_DateTimeDialogValue_Params& value);
#endif
- void OnPepperPluginHung(int plugin_child_id,
- const base::FilePath& path,
- bool is_hung);
- void OnPluginCrashed(const base::FilePath& plugin_path,
- base::ProcessId plugin_pid);
void OnDomOperationResponse(const std::string& json_string,
int automation_id);
void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy);
@@ -787,10 +778,22 @@ class CONTENT_EXPORT WebContentsImpl
void OnWebUISend(const GURL& source_url,
const std::string& name,
const base::ListValue& args);
+#if defined(ENABLE_PLUGINS)
+ void OnPepperPluginHung(int plugin_child_id,
+ const base::FilePath& path,
+ bool is_hung);
+ void OnPluginCrashed(const base::FilePath& plugin_path,
+ base::ProcessId plugin_pid);
void OnRequestPpapiBrokerPermission(int routing_id,
const GURL& url,
const base::FilePath& plugin_path);
+
+ // Callback function when requesting permission to access the PPAPI broker.
+ // |result| is true if permission was granted.
+ void OnPpapiBrokerPermissionResult(int routing_id, bool result);
+
void OnBrowserPluginMessage(const IPC::Message& message);
+#endif // defined(ENABLE_PLUGINS)
void OnDidDownloadImage(int id,
int http_status_code,
const GURL& image_url,
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698