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

Unified Diff: chrome/common/render_messages.h

Issue 1069703002: Replace the struct workaround for forward-declaring ChromeViewHostMsg_GetPluginInfo_Status with a p… (Closed) Base URL: https://chromium.googlesource.com/chromium/src@issue444203
Patch Set: update base branch Created 5 years, 8 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: chrome/common/render_messages.h
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index f75359e63013f0e83b4e52efc3489fa2a1042a40..4f615f6c53ae25943b3f9c9125533ed15ad5be49 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -45,25 +45,17 @@
#ifndef CHROME_COMMON_RENDER_MESSAGES_H_
#define CHROME_COMMON_RENDER_MESSAGES_H_
-// This enum is inside a struct so that we can forward-declare the struct in
-// others headers without having to include this one.
-struct ChromeViewHostMsg_GetPluginInfo_Status {
- enum Value {
- kAllowed,
- kBlocked,
- kBlockedByPolicy,
- kDisabled,
- kNotFound,
- kNPAPINotSupported,
- kOutdatedBlocked,
- kOutdatedDisallowed,
- kPlayImportantContent,
- kUnauthorized,
- };
-
- ChromeViewHostMsg_GetPluginInfo_Status() : value(kAllowed) {}
-
- Value value;
+enum class ChromeViewHostMsg_GetPluginInfo_Status {
+ kAllowed,
+ kBlocked,
+ kBlockedByPolicy,
+ kDisabled,
+ kNotFound,
+ kNPAPINotSupported,
+ kOutdatedBlocked,
+ kOutdatedDisallowed,
+ kPlayImportantContent,
+ kUnauthorized,
};
namespace IPC {
@@ -82,7 +74,7 @@ struct ParamTraits<ContentSettingsPattern> {
#define IPC_MESSAGE_START ChromeMsgStart
-IPC_ENUM_TRAITS_MAX_VALUE(ChromeViewHostMsg_GetPluginInfo_Status::Value,
+IPC_ENUM_TRAITS_MAX_VALUE(ChromeViewHostMsg_GetPluginInfo_Status,
ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized)
IPC_ENUM_TRAITS_MAX_VALUE(OmniboxFocusChangeReason,
OMNIBOX_FOCUS_CHANGE_REASON_LAST)
@@ -95,10 +87,6 @@ IPC_ENUM_TRAITS(ThemeBackgroundImageTiling)
IPC_ENUM_TRAITS(blink::WebConsoleMessage::Level)
IPC_ENUM_TRAITS(content::TopControlsState)
-IPC_STRUCT_TRAITS_BEGIN(ChromeViewHostMsg_GetPluginInfo_Status)
-IPC_STRUCT_TRAITS_MEMBER(value)
-IPC_STRUCT_TRAITS_END()
-
// Output parameters for ChromeViewHostMsg_GetPluginInfo message.
IPC_STRUCT_BEGIN(ChromeViewHostMsg_GetPluginInfo_Output)
IPC_STRUCT_MEMBER(ChromeViewHostMsg_GetPluginInfo_Status, status)
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter_unittest.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698