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

Unified Diff: chrome/common/extensions/extension_set.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/extension_resource_unittest.cc ('k') | chrome/common/extensions/extension_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_set.h
diff --git a/chrome/common/extensions/extension_set.h b/chrome/common/extensions/extension_set.h
index 9d46373996926c1b26be5ef9e6a10ca8061420dc..428df7f2fa59ee0174231614b0c01a47470d578b 100644
--- a/chrome/common/extensions/extension_set.h
+++ b/chrome/common/extensions/extension_set.h
@@ -41,15 +41,16 @@ class ExtensionURLInfo {
// The one true extension container. Extensions are identified by their id.
// Only one extension can be in the set with a given ID.
class ExtensionSet {
- public:
+public:
typedef std::pair<FilePath, std::string> ExtensionPathAndDefaultLocale;
- typedef std::map<std::string, scoped_refptr<const Extension> > ExtensionMap;
+ typedef std::map<std::string, scoped_refptr<const extensions::Extension> >
+ ExtensionMap;
// Iteration over the values of the map (given that it's an ExtensionSet,
// it should iterate like a set iterator).
class const_iterator :
public std::iterator<std::input_iterator_tag,
- scoped_refptr<const Extension> > {
+ scoped_refptr<const extensions::Extension> > {
public:
const_iterator() {}
explicit const_iterator(ExtensionMap::const_iterator it) :
@@ -58,7 +59,7 @@ class ExtensionSet {
++it_;
return *this;
}
- const scoped_refptr<const Extension> operator*() {
+ const scoped_refptr<const extensions::Extension> operator*() {
return it_->second;
}
bool operator!=(const const_iterator& other) { return it_ != other.it_; }
@@ -83,7 +84,7 @@ class ExtensionSet {
// Adds the specified extension to the set. The set becomes an owner. Any
// previous extension with the same ID is removed.
- void Insert(const scoped_refptr<const Extension>& extension);
+ void Insert(const scoped_refptr<const extensions::Extension>& extension);
// Copies different items from |extensions| to the current set and returns
// whether anything changed.
@@ -104,14 +105,16 @@ class ExtensionSet {
// NOTE: This can return NULL if called before UpdateExtensions receives
// bulk extension data (e.g. if called from
// EventBindings::HandleContextCreated)
- const Extension* GetExtensionOrAppByURL(const ExtensionURLInfo& info) const;
+ const extensions::Extension* GetExtensionOrAppByURL(
+ const ExtensionURLInfo& info) const;
// Returns the hosted app whose web extent contains the URL.
- const Extension* GetHostedAppByURL(const ExtensionURLInfo& info) const;
+ const extensions::Extension* GetHostedAppByURL(
+ const ExtensionURLInfo& info) const;
// Returns a hosted app that contains any URL that overlaps with the given
// extent, if one exists.
- const Extension* GetHostedAppByOverlappingWebExtent(
+ const extensions::Extension* GetHostedAppByOverlappingWebExtent(
const URLPatternSet& extent) const;
// Returns true if |new_url| is in the extent of the same extension as
@@ -119,7 +122,7 @@ class ExtensionSet {
bool InSameExtent(const GURL& old_url, const GURL& new_url) const;
// Look up an Extension object by id.
- const Extension* GetByID(const std::string& id) const;
+ const extensions::Extension* GetByID(const std::string& id) const;
// Returns true if |info| should get extension api bindings and be permitted
// to make api calls. Note that this is independent of what extension
« no previous file with comments | « chrome/common/extensions/extension_resource_unittest.cc ('k') | chrome/common/extensions/extension_set.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698