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 /chrome/browser/ui/webui/constrained_html_ui.cc | |
| 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 'chrome/browser/ui/webui/constrained_html_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/constrained_html_ui.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc index c0a5b84..6549242 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.cc +++ b/chrome/browser/ui/webui/constrained_html_ui.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/lazy_instance.h" +#include "base/property_bag.h" #include "base/values.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/chrome_notification_types.h" @@ -17,7 +18,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" -static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> > +static base::LazyInstance<base::PropertyAccessor<ConstrainedHtmlUIDelegate*> > g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; ConstrainedHtmlUI::ConstrainedHtmlUI(TabContents* contents) @@ -73,7 +74,7 @@ ConstrainedHtmlUIDelegate* ConstrainedHtmlUI::GetConstrainedDelegate() { } // static -PropertyAccessor<ConstrainedHtmlUIDelegate*>& +base::PropertyAccessor<ConstrainedHtmlUIDelegate*>& ConstrainedHtmlUI::GetPropertyAccessor() { return g_constrained_html_ui_property_accessor.Get(); } |