| Index: content/browser/web_contents/web_contents_impl.cc
|
| ===================================================================
|
| --- content/browser/web_contents/web_contents_impl.cc (revision 138369)
|
| +++ content/browser/web_contents/web_contents_impl.cc (working copy)
|
| @@ -251,7 +251,7 @@
|
| static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace));
|
| }
|
|
|
| -WebContents* WebContents::FromRenderViewHost(RenderViewHost* rvh) {
|
| +WebContents* WebContents::FromRenderViewHost(const RenderViewHost* rvh) {
|
| return rvh->GetDelegate()->GetAsWebContents();
|
| }
|
|
|
| @@ -295,7 +295,6 @@
|
| static_cast<int>(content::kMaximumZoomFactor * 100)),
|
| temporary_zoom_settings_(false),
|
| content_restrictions_(0),
|
| - view_type_(content::VIEW_TYPE_INVALID),
|
| color_chooser_(NULL) {
|
| render_manager_.Init(browser_context, site_instance, routing_id);
|
|
|
| @@ -635,14 +634,6 @@
|
| return controller_.GetBrowserContext();
|
| }
|
|
|
| -void WebContentsImpl::SetViewType(content::ViewType type) {
|
| - view_type_ = type;
|
| -}
|
| -
|
| -content::ViewType WebContentsImpl::GetViewType() const {
|
| - return view_type_;
|
| -}
|
| -
|
| const GURL& WebContentsImpl::GetURL() const {
|
| // We may not have a navigation entry yet
|
| NavigationEntry* entry = controller_.GetActiveEntry();
|
| @@ -2059,10 +2050,6 @@
|
| return this;
|
| }
|
|
|
| -content::ViewType WebContentsImpl::GetRenderViewType() const {
|
| - return view_type_;
|
| -}
|
| -
|
| gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const {
|
| if (delegate_)
|
| return delegate_->GetRootWindowResizerRect();
|
|
|