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

Unified Diff: chrome/browser/sync/test/integration/sync_extension_helper.h

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sync_extension_helper.h
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h
index 6cdca7d547439615f7382c5781ce9b39fb45be48..a7f97e817231028bfe3aa71723796d7e77035f0d 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.h
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.h
@@ -13,7 +13,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
class Profile;
class SyncTest;
@@ -38,7 +38,7 @@ class SyncExtensionHelper {
// extension ID of the new extension.
std::string InstallExtension(Profile* profile,
const std::string& name,
- extensions::Extension::Type type);
+ extensions::Manifest::Type type);
// Uninstalls the extension with the given name from |profile|.
void UninstallExtension(Profile* profile, const std::string& name);
@@ -95,7 +95,7 @@ class SyncExtensionHelper {
ExtensionNameMap;
typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap;
typedef std::map<std::string, std::string> StringMap;
- typedef std::map<std::string, extensions::Extension::Type> TypeMap;
+ typedef std::map<std::string, extensions::Manifest::Type> TypeMap;
friend struct DefaultSingletonTraits<SyncExtensionHelper>;
@@ -114,7 +114,7 @@ class SyncExtensionHelper {
// have the same id.
scoped_refptr<extensions::Extension> GetExtension(
Profile* profile, const std::string& name,
- extensions::Extension::Type type) WARN_UNUSED_RESULT;
+ extensions::Manifest::Type type) WARN_UNUSED_RESULT;
ProfileExtensionNameMap profile_extensions_;
StringMap id_to_name_;

Powered by Google App Engine
This is Rietveld 408576698