Kill PropertyBag, switch WebContents to SupportsUserData.

content/public/browser/web_contents.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/process_util.h"
 #include "base/string16.h"
+#include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_ui.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace base {
-class PropertyBag;
 class TimeTicks;
 }
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace net {
 struct LoadStateWithParam;
 }
 
 namespace content {
 
 class BrowserContext;
 class InterstitialPage;
 class RenderProcessHost;
 class RenderViewHost;
 class RenderWidgetHostView;
 class SiteInstance;
 class WebContentsDelegate;
 class WebContentsView;
 struct RendererPreferences;
 
 // Describes what goes in the main content area of a tab.
-class WebContents : public PageNavigator, public IPC::Sender {
+class WebContents : public PageNavigator,
+                    public IPC::Sender,
+                    public base::SupportsUserData {
  public:
   // |base_web_contents| is used if we want to size the new WebContents's view
   // based on the view of an existing WebContents.  This can be NULL if not
   // needed.
   CONTENT_EXPORT static WebContents* Create(
       BrowserContext* browser_context,
       SiteInstance* site_instance,
       int routing_id,
       const WebContents* base_web_contents);
 
@@ skipping 16 matching lines @@
 
   // Returns a WebContents that wraps the RenderViewHost, or NULL if the
   // render view host's delegate isn't a WebContents.
   CONTENT_EXPORT static WebContents* FromRenderViewHost(
       const RenderViewHost* rvh);
 
   virtual ~WebContents() {}
 
   // Intrinsic tab state -------------------------------------------------------
 
-  // Returns the property bag for this WebContents, 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.
-  virtual const base::PropertyBag* GetPropertyBag() const = 0;
-  virtual base::PropertyBag* GetPropertyBag() = 0;
-
   // Gets/Sets the delegate.
   virtual WebContentsDelegate* GetDelegate() = 0;
   virtual void SetDelegate(WebContentsDelegate* delegate) = 0;
 
   // Gets the controller for this WebContents.
   virtual NavigationController& GetController() = 0;
   virtual const NavigationController& GetController() const = 0;
 
   // Returns the user browser context associated with this WebContents (via the
   // NavigationController).
@@ skipping 291 matching lines @@
   // Focuses the location bar.
   virtual void SetFocusToLocationBar(bool select_all) = 0;
 
   // Does this have an opener associated with it?
   virtual bool HasOpener() const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_