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

Unified Diff: chrome/common/extensions/extension.h

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/api/extension_api.h ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 5e7df6f22ccd5af20b092ece7928e26092a18cf2..2e68ab15da94fb5b1244064291836af694d5b3b8 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -42,14 +42,16 @@ class DictionaryValue;
class ListValue;
}
-namespace extensions {
-class Manifest;
-}
-
namespace webkit_glue {
struct WebIntentServiceData;
}
+FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
+
+namespace extensions {
+
+class Manifest;
+
// Represents a Chrome extension.
class Extension : public base::RefCountedThreadSafe<Extension> {
public:
@@ -1062,7 +1064,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
std::string content_security_policy_;
FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper);
- FRIEND_TEST_ALL_PREFIXES(TabStripModelTest, Apps);
+ FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps);
DISALLOW_COPY_AND_ASSIGN(Extension);
};
@@ -1124,4 +1126,6 @@ struct UpdatedExtensionPermissionsInfo {
Reason reason);
};
+} // namespace extensions
+
#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_
« no previous file with comments | « chrome/common/extensions/api/extension_api.h ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698