| 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 <stdint.h> | 6 #include <stdint.h> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 kOutdatedDisallowed, | 42 kOutdatedDisallowed, |
| 43 kPlayImportantContent, | 43 kPlayImportantContent, |
| 44 kUnauthorized, | 44 kUnauthorized, |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 namespace IPC { | 47 namespace IPC { |
| 48 | 48 |
| 49 template <> | 49 template <> |
| 50 struct ParamTraits<ContentSettingsPattern> { | 50 struct ParamTraits<ContentSettingsPattern> { |
| 51 typedef ContentSettingsPattern param_type; | 51 typedef ContentSettingsPattern param_type; |
| 52 static void Write(Message* m, const param_type& p); | 52 static void Write(base::Pickle* m, const param_type& p); |
| 53 static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); | 53 static bool Read(const base::Pickle* m, |
| 54 base::PickleIterator* iter, |
| 55 param_type* r); |
| 54 static void Log(const param_type& p, std::string* l); | 56 static void Log(const param_type& p, std::string* l); |
| 55 }; | 57 }; |
| 56 | 58 |
| 57 } // namespace IPC | 59 } // namespace IPC |
| 58 | 60 |
| 59 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ | 61 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ |
| 60 | 62 |
| 61 #define IPC_MESSAGE_START ChromeMsgStart | 63 #define IPC_MESSAGE_START ChromeMsgStart |
| 62 | 64 |
| 63 IPC_ENUM_TRAITS_MAX_VALUE(ChromeViewHostMsg_GetPluginInfo_Status, | 65 IPC_ENUM_TRAITS_MAX_VALUE(ChromeViewHostMsg_GetPluginInfo_Status, |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 | 585 |
| 584 // Record a sample string to a Rappor metric. | 586 // Record a sample string to a Rappor metric. |
| 585 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRappor, | 587 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRappor, |
| 586 std::string /* metric */, | 588 std::string /* metric */, |
| 587 std::string /* sample */) | 589 std::string /* sample */) |
| 588 | 590 |
| 589 // Record a domain and registry of a url to a Rappor metric. | 591 // Record a domain and registry of a url to a Rappor metric. |
| 590 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRapporURL, | 592 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRapporURL, |
| 591 std::string /* metric */, | 593 std::string /* metric */, |
| 592 GURL /* sample url */) | 594 GURL /* sample url */) |
| OLD | NEW |