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

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

Issue 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments 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 unified diff | Download patch | Annotate | Revision Log
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 RenderViewHostManager* GetRenderManagerForTesting(); 144 RenderViewHostManager* GetRenderManagerForTesting();
145 145
146 // content::WebContents ------------------------------------------------------ 146 // content::WebContents ------------------------------------------------------
147 virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE; 147 virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
148 virtual base::PropertyBag* GetPropertyBag() OVERRIDE; 148 virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
149 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE; 149 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
150 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE; 150 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;
151 virtual content::NavigationController& GetController() OVERRIDE; 151 virtual content::NavigationController& GetController() OVERRIDE;
152 virtual const content::NavigationController& GetController() const OVERRIDE; 152 virtual const content::NavigationController& GetController() const OVERRIDE;
153 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE; 153 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
154 virtual void SetViewType(content::ViewType type) OVERRIDE;
155 virtual content::ViewType GetViewType() const OVERRIDE;
156 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE; 154 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
157 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE; 155 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
158 virtual content::RenderWidgetHostView* 156 virtual content::RenderWidgetHostView*
159 GetRenderWidgetHostView() const OVERRIDE; 157 GetRenderWidgetHostView() const OVERRIDE;
160 virtual content::WebContentsView* GetView() const OVERRIDE; 158 virtual content::WebContentsView* GetView() const OVERRIDE;
161 virtual content::WebUI* CreateWebUI(const GURL& url) OVERRIDE; 159 virtual content::WebUI* CreateWebUI(const GURL& url) OVERRIDE;
162 virtual content::WebUI* GetWebUI() const OVERRIDE; 160 virtual content::WebUI* GetWebUI() const OVERRIDE;
163 virtual content::WebUI* GetCommittedWebUI() const OVERRIDE; 161 virtual content::WebUI* GetCommittedWebUI() const OVERRIDE;
164 virtual void SetUserAgentOverride(const std::string& override) OVERRIDE; 162 virtual void SetUserAgentOverride(const std::string& override) OVERRIDE;
165 virtual const std::string& GetUserAgentOverride() const OVERRIDE; 163 virtual const std::string& GetUserAgentOverride() const OVERRIDE;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 const content::OpenURLParams& params) OVERRIDE; 246 const content::OpenURLParams& params) OVERRIDE;
249 247
250 // RenderViewHostDelegate ---------------------------------------------------- 248 // RenderViewHostDelegate ----------------------------------------------------
251 249
252 virtual content::RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE; 250 virtual content::RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
253 virtual content::RenderViewHostDelegate::RendererManagement* 251 virtual content::RenderViewHostDelegate::RendererManagement*
254 GetRendererManagementDelegate() OVERRIDE; 252 GetRendererManagementDelegate() OVERRIDE;
255 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 253 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
256 virtual const GURL& GetURL() const OVERRIDE; 254 virtual const GURL& GetURL() const OVERRIDE;
257 virtual WebContents* GetAsWebContents() OVERRIDE; 255 virtual WebContents* GetAsWebContents() OVERRIDE;
258 virtual content::ViewType GetRenderViewType() const OVERRIDE;
259 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 256 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
260 virtual void RenderViewCreated( 257 virtual void RenderViewCreated(
261 content::RenderViewHost* render_view_host) OVERRIDE; 258 content::RenderViewHost* render_view_host) OVERRIDE;
262 virtual void RenderViewReady( 259 virtual void RenderViewReady(
263 content::RenderViewHost* render_view_host) OVERRIDE; 260 content::RenderViewHost* render_view_host) OVERRIDE;
264 virtual void RenderViewGone(content::RenderViewHost* render_view_host, 261 virtual void RenderViewGone(content::RenderViewHost* render_view_host,
265 base::TerminationStatus status, 262 base::TerminationStatus status,
266 int error_code) OVERRIDE; 263 int error_code) OVERRIDE;
267 virtual void RenderViewDeleted( 264 virtual void RenderViewDeleted(
268 content::RenderViewHost* render_view_host) OVERRIDE; 265 content::RenderViewHost* render_view_host) OVERRIDE;
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 // remember it. 713 // remember it.
717 bool temporary_zoom_settings_; 714 bool temporary_zoom_settings_;
718 715
719 // The intrinsic size of the page. 716 // The intrinsic size of the page.
720 gfx::Size preferred_size_; 717 gfx::Size preferred_size_;
721 718
722 // Content restrictions, used to disable print/copy etc based on content's 719 // Content restrictions, used to disable print/copy etc based on content's
723 // (full-page plugins for now only) permissions. 720 // (full-page plugins for now only) permissions.
724 int content_restrictions_; 721 int content_restrictions_;
725 722
726 // Type of view this WebContents is displaying.
727 content::ViewType view_type_;
728
729 // Color chooser that was opened by this tab. 723 // Color chooser that was opened by this tab.
730 content::ColorChooser* color_chooser_; 724 content::ColorChooser* color_chooser_;
731 725
732 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 726 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
733 }; 727 };
734 728
735 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 729 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698