| 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 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
| 6 #include <map> | 6 #include <map> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 kJavaScriptStressTestSetStressRunType = 0, | 57 kJavaScriptStressTestSetStressRunType = 0, |
| 58 kJavaScriptStressTestPrepareStressRun = 1, | 58 kJavaScriptStressTestPrepareStressRun = 1, |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 // This enum is inside a struct so that we can forward-declare the struct in | 61 // This enum is inside a struct so that we can forward-declare the struct in |
| 62 // others headers without having to include this one. | 62 // others headers without having to include this one. |
| 63 struct ChromeViewHostMsg_GetPluginInfo_Status { | 63 struct ChromeViewHostMsg_GetPluginInfo_Status { |
| 64 enum Value { | 64 enum Value { |
| 65 kAllowed, | 65 kAllowed, |
| 66 kBlocked, | 66 kBlocked, |
| 67 kBlockedByPolicy, |
| 67 kClickToPlay, | 68 kClickToPlay, |
| 68 kDisabled, | 69 kDisabled, |
| 69 kNotFound, | 70 kNotFound, |
| 70 kNPAPINotSupported, | 71 kNPAPINotSupported, |
| 71 kOutdatedBlocked, | 72 kOutdatedBlocked, |
| 72 kOutdatedDisallowed, | 73 kOutdatedDisallowed, |
| 73 kUnauthorized, | 74 kUnauthorized, |
| 74 }; | 75 }; |
| 75 | 76 |
| 76 ChromeViewHostMsg_GetPluginInfo_Status() : value(kAllowed) {} | 77 ChromeViewHostMsg_GetPluginInfo_Status() : value(kAllowed) {} |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 114 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 114 static void Log(const param_type& p, std::string* l); | 115 static void Log(const param_type& p, std::string* l); |
| 115 }; | 116 }; |
| 116 | 117 |
| 117 } // namespace IPC | 118 } // namespace IPC |
| 118 | 119 |
| 119 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ | 120 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ |
| 120 | 121 |
| 121 #define IPC_MESSAGE_START ChromeMsgStart | 122 #define IPC_MESSAGE_START ChromeMsgStart |
| 122 | 123 |
| 123 IPC_ENUM_TRAITS(ChromeViewHostMsg_GetPluginInfo_Status::Value) | 124 IPC_ENUM_TRAITS_MAX_VALUE(ChromeViewHostMsg_GetPluginInfo_Status::Value, |
| 125 ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized) |
| 124 IPC_ENUM_TRAITS(OmniboxFocusChangeReason) | 126 IPC_ENUM_TRAITS(OmniboxFocusChangeReason) |
| 125 IPC_ENUM_TRAITS(OmniboxFocusState) | 127 IPC_ENUM_TRAITS(OmniboxFocusState) |
| 126 IPC_ENUM_TRAITS(search_provider::OSDDType) | 128 IPC_ENUM_TRAITS(search_provider::OSDDType) |
| 127 IPC_ENUM_TRAITS(search_provider::InstallState) | 129 IPC_ENUM_TRAITS(search_provider::InstallState) |
| 128 IPC_ENUM_TRAITS(ThemeBackgroundImageAlignment) | 130 IPC_ENUM_TRAITS(ThemeBackgroundImageAlignment) |
| 129 IPC_ENUM_TRAITS(ThemeBackgroundImageTiling) | 131 IPC_ENUM_TRAITS(ThemeBackgroundImageTiling) |
| 130 IPC_ENUM_TRAITS(TranslateErrors::Type) | 132 IPC_ENUM_TRAITS(TranslateErrors::Type) |
| 131 IPC_ENUM_TRAITS(blink::WebConsoleMessage::Level) | 133 IPC_ENUM_TRAITS(blink::WebConsoleMessage::Level) |
| 132 IPC_ENUM_TRAITS(content::TopControlsState) | 134 IPC_ENUM_TRAITS(content::TopControlsState) |
| 133 | 135 |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 std::vector<GURL> /* search_urls */, | 757 std::vector<GURL> /* search_urls */, |
| 756 GURL /* new_tab_page_url */) | 758 GURL /* new_tab_page_url */) |
| 757 | 759 |
| 758 // Tells listeners that a detailed message was reported to the console by | 760 // Tells listeners that a detailed message was reported to the console by |
| 759 // WebKit. | 761 // WebKit. |
| 760 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DetailedConsoleMessageAdded, | 762 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DetailedConsoleMessageAdded, |
| 761 base::string16 /* message */, | 763 base::string16 /* message */, |
| 762 base::string16 /* source */, | 764 base::string16 /* source */, |
| 763 extensions::StackTrace /* stack trace */, | 765 extensions::StackTrace /* stack trace */, |
| 764 int32 /* severity level */) | 766 int32 /* severity level */) |
| OLD | NEW |