diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 00:58:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 00:58:23 +0000 |
| commit | 45644f6cc27340a43cddec94054c0c90ef65b7c9 (patch) | |
| tree | 18aa26a314a5ff51bc82c40cb709427ebe8a754a /content/browser/tab_contents | |
| parent | ffe38f8add90e8c29055cd2aed4937ed5c45273a (diff) | |
| download | chromium_src-45644f6cc27340a43cddec94054c0c90ef65b7c9.zip chromium_src-45644f6cc27340a43cddec94054c0c90ef65b7c9.tar.gz chromium_src-45644f6cc27340a43cddec94054c0c90ef65b7c9.tar.bz2 | |
Move PropertyBag to base. Originally this was in chrome\common because only chrome used it. Now that chrome and content use it, and that we want to only expose interface through the content API, this belongs in base.
BUG=98716
Review URL: http://codereview.chromium.org/8652002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 9f7dd31..846a8f5 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -14,6 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "base/property_bag.h" #include "base/string16.h" #include "content/browser/download/save_package.h" #include "content/browser/javascript_dialogs.h" @@ -26,7 +27,6 @@ #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/browser/webui/web_ui.h" #include "content/common/content_export.h" -#include "content/common/property_bag.h" #include "content/public/common/renderer_preferences.h" #include "net/base/load_states.h" #include "ui/gfx/native_widget_types.h" @@ -87,8 +87,8 @@ class CONTENT_EXPORT TabContents : public PageNavigator, // Returns the property bag for this tab contents, where callers can add // extra data they may wish to associate with the tab. Returns a pointer // rather than a reference since the PropertyAccessors expect this. - const PropertyBag* property_bag() const { return &property_bag_; } - PropertyBag* property_bag() { return &property_bag_; } + const base::PropertyBag* property_bag() const { return &property_bag_; } + base::PropertyBag* property_bag() { return &property_bag_; } TabContentsDelegate* delegate() const { return delegate_; } void set_delegate(TabContentsDelegate* delegate); @@ -734,7 +734,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator, // Stores random bits of data for others to associate with this object. // WARNING: this needs to be deleted after NavigationController. - PropertyBag property_bag_; + base::PropertyBag property_bag_; // Data for core operation --------------------------------------------------- |