content/browser/web_contents/web_contents_view_aura.cc - Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/renderer/media/rtc_encoding_video_capturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_aura.cc

diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc

index 947f639a3f401c8f842dd056e4ae597d6e1dcb93..c7bdaaaa790ee977acecc90e062d0bc6e74eb7ba 100644

--- a/content/browser/web_contents/web_contents_view_aura.cc

+++ b/content/browser/web_contents/web_contents_view_aura.cc

@@ -112,7 +112,7 @@ class OverscrollWindowDelegate : public ImageWindowDelegate {

}

gfx::Image image;

- if (entry && entry->screenshot()) {

+ if (entry && entry->screenshot().get()) {

std::vector<gfx::ImagePNGRep> image_reps;

image_reps.push_back(gfx::ImagePNGRep(entry->screenshot(),

ui::GetScaleFactorForNativeView(web_contents_window())));

@@ -479,7 +479,7 @@ class OverscrollNavigationOverlay :

controller.GetEntryAtOffset(offset));

gfx::Image image;

- if (entry && entry->screenshot()) {

+ if (entry && entry->screenshot().get()) {

std::vector<gfx::ImagePNGRep> image_reps;

image_reps.push_back(gfx::ImagePNGRep(entry->screenshot(),

ui::GetScaleFactorForNativeView(window_.get())));