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

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

Issue 14081010: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix some gtk issues Created 7 years, 8 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 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 NOTREACHED(); 1103 NOTREACHED();
1104 } 1104 }
1105 } 1105 }
1106 1106
1107 void WebContentsImpl::Init(const WebContents::CreateParams& params) { 1107 void WebContentsImpl::Init(const WebContents::CreateParams& params) {
1108 render_manager_.Init( 1108 render_manager_.Init(
1109 params.browser_context, params.site_instance, params.routing_id); 1109 params.browser_context, params.site_instance, params.routing_id);
1110 1110
1111 view_.reset(GetContentClient()->browser()-> 1111 view_.reset(GetContentClient()->browser()->
1112 OverrideCreateWebContentsView(this, &render_view_host_delegate_view_)); 1112 OverrideCreateWebContentsView(this, &render_view_host_delegate_view_));
1113 if (view_.get()) { 1113 if (view_) {
1114 CHECK(render_view_host_delegate_view_); 1114 CHECK(render_view_host_delegate_view_);
1115 } else { 1115 } else {
1116 WebContentsViewDelegate* delegate = 1116 WebContentsViewDelegate* delegate =
1117 GetContentClient()->browser()->GetWebContentsViewDelegate(this); 1117 GetContentClient()->browser()->GetWebContentsViewDelegate(this);
1118 1118
1119 if (browser_plugin_guest_.get()) { 1119 if (browser_plugin_guest_) {
1120 WebContentsViewPort* platform_view = CreateWebContentsView( 1120 WebContentsViewPort* platform_view = CreateWebContentsView(
1121 this, delegate, &render_view_host_delegate_view_); 1121 this, delegate, &render_view_host_delegate_view_);
1122 1122
1123 WebContentsViewGuest* rv = new WebContentsViewGuest( 1123 WebContentsViewGuest* rv = new WebContentsViewGuest(
1124 this, browser_plugin_guest_.get(), platform_view); 1124 this, browser_plugin_guest_.get(), platform_view);
1125 render_view_host_delegate_view_ = rv; 1125 render_view_host_delegate_view_ = rv;
1126 view_.reset(rv); 1126 view_.reset(rv);
1127 } else { 1127 } else {
1128 // Regular WebContentsView. 1128 // Regular WebContentsView.
1129 view_.reset(CreateWebContentsView( 1129 view_.reset(CreateWebContentsView(
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after
2570 return this; 2570 return this;
2571 } 2571 }
2572 2572
2573 gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const { 2573 gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const {
2574 if (delegate_) 2574 if (delegate_)
2575 return delegate_->GetRootWindowResizerRect(); 2575 return delegate_->GetRootWindowResizerRect();
2576 return gfx::Rect(); 2576 return gfx::Rect();
2577 } 2577 }
2578 2578
2579 void WebContentsImpl::RemoveBrowserPluginEmbedder() { 2579 void WebContentsImpl::RemoveBrowserPluginEmbedder() {
2580 if (browser_plugin_embedder_.get()) 2580 if (browser_plugin_embedder_)
2581 browser_plugin_embedder_.reset(); 2581 browser_plugin_embedder_.reset();
2582 } 2582 }
2583 2583
2584 void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) { 2584 void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) {
2585 // Don't send notifications if we are just creating a swapped-out RVH for 2585 // Don't send notifications if we are just creating a swapped-out RVH for
2586 // the opener chain. These won't be used for view-source or WebUI, so it's 2586 // the opener chain. These won't be used for view-source or WebUI, so it's
2587 // ok to return early. 2587 // ok to return early.
2588 if (static_cast<RenderViewHostImpl*>(render_view_host)->is_swapped_out()) 2588 if (static_cast<RenderViewHostImpl*>(render_view_host)->is_swapped_out())
2589 return; 2589 return;
2590 2590
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
3406 } 3406 }
3407 3407
3408 BrowserPluginGuestManager* 3408 BrowserPluginGuestManager*
3409 WebContentsImpl::GetBrowserPluginGuestManager() const { 3409 WebContentsImpl::GetBrowserPluginGuestManager() const {
3410 return static_cast<BrowserPluginGuestManager*>( 3410 return static_cast<BrowserPluginGuestManager*>(
3411 GetBrowserContext()->GetUserData( 3411 GetBrowserContext()->GetUserData(
3412 browser_plugin::kBrowserPluginGuestManagerKeyName)); 3412 browser_plugin::kBrowserPluginGuestManagerKeyName));
3413 } 3413 }
3414 3414
3415 } // namespace content 3415 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/render_view_host_manager.cc ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698