| Index: components/bookmarks/common/android/bookmark_type_list.h
|
| diff --git a/components/cronet/android/org_chromium_net_UrlRequest_error_list.h b/components/bookmarks/common/android/bookmark_type_list.h
|
| similarity index 51%
|
| copy from components/cronet/android/org_chromium_net_UrlRequest_error_list.h
|
| copy to components/bookmarks/common/android/bookmark_type_list.h
|
| index 4f4cdb8c9cd5447c39d17c66fa9b26434d89e315..e0a65948d0258503ed6f9a9cce0fc9e37144a8a2 100644
|
| --- a/components/cronet/android/org_chromium_net_UrlRequest_error_list.h
|
| +++ b/components/bookmarks/common/android/bookmark_type_list.h
|
| @@ -4,11 +4,10 @@
|
|
|
| // This file intentionally does not have header guards, it's included
|
| // inside a macro to generate enum values.
|
| -#ifndef DEFINE_REQUEST_ERROR
|
| -#error "DEFINE_REQUEST_ERROR should be defined before including this file"
|
| +
|
| +#ifndef DEFINE_BOOKMARK_TYPE
|
| +#error "DEFINE_BOOKMARK_TYPE should be defined before including this file"
|
| #endif
|
| -DEFINE_REQUEST_ERROR(SUCCESS, 0)
|
| -DEFINE_REQUEST_ERROR(UNKNOWN, 1)
|
| -DEFINE_REQUEST_ERROR(MALFORMED_URL, 2)
|
| -DEFINE_REQUEST_ERROR(CONNECTION_TIMED_OUT, 3)
|
| -DEFINE_REQUEST_ERROR(UNKNOWN_HOST, 4)
|
| +
|
| +DEFINE_BOOKMARK_TYPE(NORMAL, 0)
|
| +DEFINE_BOOKMARK_TYPE(PARTNER, 1)
|
|
|