Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: chrome/browser/extensions/extension_sync_data.h

Issue 2054773002: Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing the build Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_EXTENSION_SYNC_DATA_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 GURL url; 46 GURL url;
47 int size; 47 int size;
48 }; 48 };
49 49
50 // Extension constructor. 50 // Extension constructor.
51 ExtensionSyncData(const Extension& extension, 51 ExtensionSyncData(const Extension& extension,
52 bool enabled, 52 bool enabled,
53 int disable_reasons, 53 int disable_reasons,
54 bool incognito_enabled, 54 bool incognito_enabled,
55 bool remote_install, 55 bool remote_install,
56 OptionalBoolean all_urls_enabled); 56 OptionalBoolean all_urls_enabled,
57 bool installed_by_custodian);
57 // App constructor. 58 // App constructor.
58 ExtensionSyncData(const Extension& extension, 59 ExtensionSyncData(const Extension& extension,
59 bool enabled, 60 bool enabled,
60 int disable_reasons, 61 int disable_reasons,
61 bool incognito_enabled, 62 bool incognito_enabled,
62 bool remote_install, 63 bool remote_install,
63 OptionalBoolean all_urls_enabled, 64 OptionalBoolean all_urls_enabled,
65 bool installed_by_custodian,
64 const syncer::StringOrdinal& app_launch_ordinal, 66 const syncer::StringOrdinal& app_launch_ordinal,
65 const syncer::StringOrdinal& page_ordinal, 67 const syncer::StringOrdinal& page_ordinal,
66 extensions::LaunchType launch_type); 68 extensions::LaunchType launch_type);
67 ExtensionSyncData(const ExtensionSyncData& other); 69 ExtensionSyncData(const ExtensionSyncData& other);
68 ~ExtensionSyncData(); 70 ~ExtensionSyncData();
69 71
70 // For constructing an ExtensionSyncData from received sync data. 72 // For constructing an ExtensionSyncData from received sync data.
71 // May return null if the sync data was invalid. 73 // May return null if the sync data was invalid.
72 static std::unique_ptr<ExtensionSyncData> CreateFromSyncData( 74 static std::unique_ptr<ExtensionSyncData> CreateFromSyncData(
73 const syncer::SyncData& sync_data); 75 const syncer::SyncData& sync_data);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 extensions::LaunchType launch_type_; 168 extensions::LaunchType launch_type_;
167 std::string bookmark_app_url_; 169 std::string bookmark_app_url_;
168 std::string bookmark_app_description_; 170 std::string bookmark_app_description_;
169 std::string bookmark_app_icon_color_; 171 std::string bookmark_app_icon_color_;
170 std::vector<LinkedAppIconInfo> linked_icons_; 172 std::vector<LinkedAppIconInfo> linked_icons_;
171 }; 173 };
172 174
173 } // namespace extensions 175 } // namespace extensions
174 176
175 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_ 177 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/extensions/extension_sync_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698