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

Unified Diff: chrome/browser/extensions/extension_browsertest.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
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_browsertest.h
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 03743b21b12ca0ae7ef2e6d214695a69c30b2955..3dec2addd3a02e6fc888554abe1538bd49bfe21a 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -17,6 +17,7 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/feature_switch.h"
#include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_observer.h"
@@ -97,12 +98,12 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
expected_change);
}
- // Same as above, but an install source other than Extension::INTERNAL can be
+ // Same as above, but an install source other than Manifest::INTERNAL can be
// specified.
const extensions::Extension* InstallExtension(
const FilePath& path,
int expected_change,
- extensions::Extension::Location install_source) {
+ extensions::Manifest::Location install_source) {
return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
expected_change, install_source);
}
@@ -240,13 +241,13 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
const FilePath& path,
InstallUIType ui_type,
int expected_change,
- extensions::Extension::Location install_source);
+ extensions::Manifest::Location install_source);
const extensions::Extension* InstallOrUpdateExtension(
const std::string& id,
const FilePath& path,
InstallUIType ui_type,
int expected_change,
- extensions::Extension::Location install_source,
+ extensions::Manifest::Location install_source,
Browser* browser,
bool from_webstore);
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698