| 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 26 matching lines...) Expand all Loading... |
| 37 kAllowed, | 37 kAllowed, |
| 38 kBlocked, | 38 kBlocked, |
| 39 kBlockedByPolicy, | 39 kBlockedByPolicy, |
| 40 kComponentUpdateRequired, | 40 kComponentUpdateRequired, |
| 41 kDisabled, | 41 kDisabled, |
| 42 kFlashHiddenPreferHtml, | 42 kFlashHiddenPreferHtml, |
| 43 kNotFound, | 43 kNotFound, |
| 44 kOutdatedBlocked, | 44 kOutdatedBlocked, |
| 45 kOutdatedDisallowed, | 45 kOutdatedDisallowed, |
| 46 kPlayImportantContent, | 46 kPlayImportantContent, |
| 47 kRestartRequired, |
| 47 kUnauthorized, | 48 kUnauthorized, |
| 48 }; | 49 }; |
| 49 | 50 |
| 50 namespace IPC { | 51 namespace IPC { |
| 51 | 52 |
| 52 template <> | 53 template <> |
| 53 struct ParamTraits<ContentSettingsPattern> { | 54 struct ParamTraits<ContentSettingsPattern> { |
| 54 typedef ContentSettingsPattern param_type; | 55 typedef ContentSettingsPattern param_type; |
| 55 static void GetSize(base::PickleSizer* s, const param_type& p); | 56 static void GetSize(base::PickleSizer* s, const param_type& p); |
| 56 static void Write(base::Pickle* m, const param_type& p); | 57 static void Write(base::Pickle* m, const param_type& p); |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 | 568 |
| 568 // Record a sample string to a Rappor metric. | 569 // Record a sample string to a Rappor metric. |
| 569 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRappor, | 570 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRappor, |
| 570 std::string /* metric */, | 571 std::string /* metric */, |
| 571 std::string /* sample */) | 572 std::string /* sample */) |
| 572 | 573 |
| 573 // Record a domain and registry of a url to a Rappor metric. | 574 // Record a domain and registry of a url to a Rappor metric. |
| 574 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRapporURL, | 575 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_RecordRapporURL, |
| 575 std::string /* metric */, | 576 std::string /* metric */, |
| 576 GURL /* sample url */) | 577 GURL /* sample url */) |
| OLD | NEW |