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

Side by Side Diff: chrome/browser/sync/test/integration/sync_extension_helper.h

Issue 1136543003: Extensions: Store disable reasons in Sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix memleak in test Created 5 years, 7 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_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_ 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 private: 77 private:
78 struct ExtensionState { 78 struct ExtensionState {
79 enum EnabledState { DISABLED, PENDING, ENABLED }; 79 enum EnabledState { DISABLED, PENDING, ENABLED };
80 80
81 ExtensionState(); 81 ExtensionState();
82 ~ExtensionState(); 82 ~ExtensionState();
83 bool Equals(const ExtensionState &other) const; 83 bool Equals(const ExtensionState &other) const;
84 84
85 EnabledState enabled_state; 85 EnabledState enabled_state;
86 int disable_reasons;
86 bool incognito_enabled; 87 bool incognito_enabled;
87 }; 88 };
88 89
89 typedef std::map<std::string, ExtensionState> ExtensionStateMap; 90 typedef std::map<std::string, ExtensionState> ExtensionStateMap;
90 typedef std::map<std::string, scoped_refptr<extensions::Extension> > 91 typedef std::map<std::string, scoped_refptr<extensions::Extension> >
91 ExtensionNameMap; 92 ExtensionNameMap;
92 typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap; 93 typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap;
93 typedef std::map<std::string, std::string> StringMap; 94 typedef std::map<std::string, std::string> StringMap;
94 typedef std::map<std::string, extensions::Manifest::Type> TypeMap; 95 typedef std::map<std::string, extensions::Manifest::Type> TypeMap;
95 96
(...skipping 18 matching lines...) Expand all
114 115
115 ProfileExtensionNameMap profile_extensions_; 116 ProfileExtensionNameMap profile_extensions_;
116 StringMap id_to_name_; 117 StringMap id_to_name_;
117 TypeMap id_to_type_; 118 TypeMap id_to_type_;
118 bool setup_completed_; 119 bool setup_completed_;
119 120
120 DISALLOW_COPY_AND_ASSIGN(SyncExtensionHelper); 121 DISALLOW_COPY_AND_ASSIGN(SyncExtensionHelper);
121 }; 122 };
122 123
123 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_ 124 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698