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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 10831407: Kill PropertyBag, switch WebContents to SupportsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/view_type_utils.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "base/property_bag.h"
16 #include "content/browser/browser_plugin/old/old_browser_plugin_host.h" 15 #include "content/browser/browser_plugin/old/old_browser_plugin_host.h"
17 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" 16 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"
18 #include "content/browser/renderer_host/render_view_host_delegate.h" 17 #include "content/browser/renderer_host/render_view_host_delegate.h"
19 #include "content/browser/renderer_host/render_widget_host_delegate.h" 18 #include "content/browser/renderer_host/render_widget_host_delegate.h"
20 #include "content/browser/web_contents/navigation_controller_impl.h" 19 #include "content/browser/web_contents/navigation_controller_impl.h"
21 #include "content/browser/web_contents/render_view_host_manager.h" 20 #include "content/browser/web_contents/render_view_host_manager.h"
22 #include "content/common/content_export.h" 21 #include "content/common/content_export.h"
23 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
24 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
25 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 155 }
157 156
158 content::old::BrowserPluginHost* old_browser_plugin_host() const { 157 content::old::BrowserPluginHost* old_browser_plugin_host() const {
159 return old_browser_plugin_host_.get(); 158 return old_browser_plugin_host_.get();
160 } 159 }
161 160
162 // Expose the render manager for testing. 161 // Expose the render manager for testing.
163 RenderViewHostManager* GetRenderManagerForTesting(); 162 RenderViewHostManager* GetRenderManagerForTesting();
164 163
165 // content::WebContents ------------------------------------------------------ 164 // content::WebContents ------------------------------------------------------
166 virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
167 virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
168 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE; 165 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
169 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE; 166 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;
170 virtual NavigationControllerImpl& GetController() OVERRIDE; 167 virtual NavigationControllerImpl& GetController() OVERRIDE;
171 virtual const NavigationControllerImpl& GetController() const OVERRIDE; 168 virtual const NavigationControllerImpl& GetController() const OVERRIDE;
172 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE; 169 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
173 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE; 170 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
174 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE; 171 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
175 virtual int GetRoutingID() const OVERRIDE; 172 virtual int GetRoutingID() const OVERRIDE;
176 virtual content::RenderWidgetHostView* 173 virtual content::RenderWidgetHostView*
177 GetRenderWidgetHostView() const OVERRIDE; 174 GetRenderWidgetHostView() const OVERRIDE;
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 void SaveURL(const GURL& url, 632 void SaveURL(const GURL& url,
636 const content::Referrer& referrer, 633 const content::Referrer& referrer,
637 bool is_main_frame); 634 bool is_main_frame);
638 635
639 content::RenderViewHostImpl* GetRenderViewHostImpl(); 636 content::RenderViewHostImpl* GetRenderViewHostImpl();
640 637
641 void GetBrowserPluginEmbedderInfo(content::RenderViewHost* render_view_host, 638 void GetBrowserPluginEmbedderInfo(content::RenderViewHost* render_view_host,
642 std::string* embedder_channel_name, 639 std::string* embedder_channel_name,
643 int* embedder_container_id); 640 int* embedder_container_id);
644 641
645 // Stores random bits of data for others to associate with this object.
646 // WARNING: this needs to be deleted after NavigationController.
647 base::PropertyBag property_bag_;
648
649 // Data for core operation --------------------------------------------------- 642 // Data for core operation ---------------------------------------------------
650 643
651 // Delegate for notifying our owner about stuff. Not owned by us. 644 // Delegate for notifying our owner about stuff. Not owned by us.
652 content::WebContentsDelegate* delegate_; 645 content::WebContentsDelegate* delegate_;
653 646
654 // Handles the back/forward list and loading. 647 // Handles the back/forward list and loading.
655 NavigationControllerImpl controller_; 648 NavigationControllerImpl controller_;
656 649
657 // The corresponding view. 650 // The corresponding view.
658 scoped_ptr<content::WebContentsView> view_; 651 scoped_ptr<content::WebContentsView> view_;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 content::NotificationRegistrar registrar_; 810 content::NotificationRegistrar registrar_;
818 811
819 // Used during IPC message dispatching so that the handlers can get a pointer 812 // Used during IPC message dispatching so that the handlers can get a pointer
820 // to the RVH through which the message was received. 813 // to the RVH through which the message was received.
821 content::RenderViewHost* message_source_; 814 content::RenderViewHost* message_source_;
822 815
823 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 816 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
824 }; 817 };
825 818
826 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 819 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/view_type_utils.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698