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 #ifndef CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ |
6 #define CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ | 6 #define CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ |
7 | 7 |
8 #include "chrome/browser/extensions/extension_sync_data.h" | 8 #include "chrome/browser/extensions/extension_sync_data.h" |
9 #include "extensions/common/constants.h" | 9 #include "extensions/common/constants.h" |
10 #include "sync/api/string_ordinal.h" | 10 #include "sync/api/string_ordinal.h" |
11 #include "sync/api/sync_change.h" | 11 #include "sync/api/sync_change.h" |
| 12 #include "third_party/skia/include/core/SkColor.h" |
12 | 13 |
13 namespace syncer { | 14 namespace syncer { |
14 class SyncData; | 15 class SyncData; |
15 } | 16 } |
16 | 17 |
17 namespace sync_pb { | 18 namespace sync_pb { |
18 class AppSpecifics; | 19 class AppSpecifics; |
19 } | 20 } |
20 | 21 |
21 namespace extensions { | 22 namespace extensions { |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 } | 64 } |
64 | 65 |
65 const std::string& bookmark_app_url() const { | 66 const std::string& bookmark_app_url() const { |
66 return bookmark_app_url_; | 67 return bookmark_app_url_; |
67 } | 68 } |
68 | 69 |
69 const std::string& bookmark_app_description() const { | 70 const std::string& bookmark_app_description() const { |
70 return bookmark_app_description_; | 71 return bookmark_app_description_; |
71 } | 72 } |
72 | 73 |
| 74 const std::string& bookmark_app_icon_color() const { |
| 75 return bookmark_app_icon_color_; |
| 76 } |
| 77 |
73 private: | 78 private: |
74 // Convert an AppSyncData back out to a sync structure. | 79 // Convert an AppSyncData back out to a sync structure. |
75 void PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const; | 80 void PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const; |
76 | 81 |
77 // Populate this class from sync inputs. | 82 // Populate this class from sync inputs. |
78 void PopulateFromAppSpecifics( | 83 void PopulateFromAppSpecifics( |
79 const sync_pb::AppSpecifics& specifics); | 84 const sync_pb::AppSpecifics& specifics); |
80 void PopulateFromSyncData(const syncer::SyncData& sync_data); | 85 void PopulateFromSyncData(const syncer::SyncData& sync_data); |
81 | 86 |
82 ExtensionSyncData extension_sync_data_; | 87 ExtensionSyncData extension_sync_data_; |
83 syncer::StringOrdinal app_launch_ordinal_; | 88 syncer::StringOrdinal app_launch_ordinal_; |
84 syncer::StringOrdinal page_ordinal_; | 89 syncer::StringOrdinal page_ordinal_; |
85 extensions::LaunchType launch_type_; | 90 extensions::LaunchType launch_type_; |
86 std::string bookmark_app_url_; | 91 std::string bookmark_app_url_; |
87 std::string bookmark_app_description_; | 92 std::string bookmark_app_description_; |
| 93 std::string bookmark_app_icon_color_; |
88 }; | 94 }; |
89 | 95 |
90 } // namespace extensions | 96 } // namespace extensions |
91 | 97 |
92 #endif // CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ | 98 #endif // CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_ |
93 | 99 |
OLD | NEW |