| OLD | NEW | 
|   1 // Copyright 2014 The Chromium Authors. All rights reserved. |   1 // Copyright 2014 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 // Singly or Multiply-included shared traits file depending on circumstances. |   5 // Singly or Multiply-included shared traits file depending on circumstances. | 
|   6 // This allows the use of IPC serialization macros in more than one IPC message |   6 // This allows the use of IPC serialization macros in more than one IPC message | 
|   7 // file. |   7 // file. | 
|   8 #ifndef CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ |   8 #ifndef CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ | 
|   9 #define CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ |   9 #define CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ | 
|  10  |  10  | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
|  28 #if defined(OS_WIN) |  28 #if defined(OS_WIN) | 
|  29 IPC_ENUM_TRAITS_MIN_MAX_VALUE(importer::ImporterType, |  29 IPC_ENUM_TRAITS_MIN_MAX_VALUE(importer::ImporterType, | 
|  30                               importer::TYPE_UNKNOWN, |  30                               importer::TYPE_UNKNOWN, | 
|  31                               importer::TYPE_EDGE) |  31                               importer::TYPE_EDGE) | 
|  32 #else |  32 #else | 
|  33 IPC_ENUM_TRAITS_MIN_MAX_VALUE(importer::ImporterType, |  33 IPC_ENUM_TRAITS_MIN_MAX_VALUE(importer::ImporterType, | 
|  34                               importer::TYPE_UNKNOWN, |  34                               importer::TYPE_UNKNOWN, | 
|  35                               importer::TYPE_BOOKMARKS_FILE) |  35                               importer::TYPE_BOOKMARKS_FILE) | 
|  36 #endif |  36 #endif | 
|  37  |  37  | 
 |  38 IPC_ENUM_TRAITS_MIN_MAX_VALUE(importer::ImportItem, | 
 |  39                               importer::NONE, | 
 |  40                               importer::ALL) | 
 |  41  | 
|  38 IPC_STRUCT_TRAITS_BEGIN(importer::SourceProfile) |  42 IPC_STRUCT_TRAITS_BEGIN(importer::SourceProfile) | 
|  39   IPC_STRUCT_TRAITS_MEMBER(importer_name) |  43   IPC_STRUCT_TRAITS_MEMBER(importer_name) | 
|  40   IPC_STRUCT_TRAITS_MEMBER(importer_type) |  44   IPC_STRUCT_TRAITS_MEMBER(importer_type) | 
|  41   IPC_STRUCT_TRAITS_MEMBER(source_path) |  45   IPC_STRUCT_TRAITS_MEMBER(source_path) | 
|  42   IPC_STRUCT_TRAITS_MEMBER(app_path) |  46   IPC_STRUCT_TRAITS_MEMBER(app_path) | 
|  43   IPC_STRUCT_TRAITS_MEMBER(services_supported) |  47   IPC_STRUCT_TRAITS_MEMBER(services_supported) | 
|  44   IPC_STRUCT_TRAITS_MEMBER(locale) |  48   IPC_STRUCT_TRAITS_MEMBER(locale) | 
|  45 IPC_STRUCT_TRAITS_END() |  49 IPC_STRUCT_TRAITS_END() | 
|  46  |  50  | 
|  47 IPC_STRUCT_TRAITS_BEGIN(ImporterURLRow) |  51 IPC_STRUCT_TRAITS_BEGIN(ImporterURLRow) | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
|  75 IPC_STRUCT_TRAITS_END() |  79 IPC_STRUCT_TRAITS_END() | 
|  76  |  80  | 
|  77 IPC_STRUCT_TRAITS_BEGIN(ImporterAutofillFormDataEntry) |  81 IPC_STRUCT_TRAITS_BEGIN(ImporterAutofillFormDataEntry) | 
|  78   IPC_STRUCT_TRAITS_MEMBER(name) |  82   IPC_STRUCT_TRAITS_MEMBER(name) | 
|  79   IPC_STRUCT_TRAITS_MEMBER(value) |  83   IPC_STRUCT_TRAITS_MEMBER(value) | 
|  80   IPC_STRUCT_TRAITS_MEMBER(times_used) |  84   IPC_STRUCT_TRAITS_MEMBER(times_used) | 
|  81   IPC_STRUCT_TRAITS_MEMBER(first_used) |  85   IPC_STRUCT_TRAITS_MEMBER(first_used) | 
|  82   IPC_STRUCT_TRAITS_MEMBER(last_used) |  86   IPC_STRUCT_TRAITS_MEMBER(last_used) | 
|  83 IPC_STRUCT_TRAITS_END() |  87 IPC_STRUCT_TRAITS_END() | 
|  84  |  88  | 
|  85 #if defined(OS_WIN) |  | 
|  86 IPC_STRUCT_TRAITS_BEGIN(importer::ImporterIE7PasswordInfo) |  89 IPC_STRUCT_TRAITS_BEGIN(importer::ImporterIE7PasswordInfo) | 
|  87   IPC_STRUCT_TRAITS_MEMBER(url_hash) |  90   IPC_STRUCT_TRAITS_MEMBER(url_hash) | 
|  88   IPC_STRUCT_TRAITS_MEMBER(encrypted_data) |  91   IPC_STRUCT_TRAITS_MEMBER(encrypted_data) | 
|  89   IPC_STRUCT_TRAITS_MEMBER(date_created) |  92   IPC_STRUCT_TRAITS_MEMBER(date_created) | 
|  90 IPC_STRUCT_TRAITS_END() |  93 IPC_STRUCT_TRAITS_END() | 
|  91 #endif |  | 
|  92  |  94  | 
|  93 #endif  // CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ |  95 #endif  // CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_ | 
| OLD | NEW |