ash/desktop_background/desktop_background_controller.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: ash/desktop_background/desktop_background_controller.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

Index: ash/desktop_background/desktop_background_controller.cc

diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc

index 25b63c390e1046263ac78b7aef0df8cf7eaa8889..9928893264530066a3b15111ee3cd0f8375444db 100644

--- a/ash/desktop_background/desktop_background_controller.cc

+++ b/ash/desktop_background/desktop_background_controller.cc

@@ -360,7 +360,7 @@ bool DesktopBackgroundController::MoveDesktopToUnlockedContainer() {

bool DesktopBackgroundController::DefaultWallpaperIsAlreadyLoadingOrLoaded(

const base::FilePath& image_file, int image_resource_id) const {

- return (wallpaper_loader_ &&

+ return (wallpaper_loader_.get() &&

wallpaper_loader_->file_path() == image_file &&

wallpaper_loader_->resource_id() == image_resource_id) ||

(current_wallpaper_.get() &&

« no previous file with comments | « no previous file | cc/test/fake_picture_layer_tiling_client.h » ('j') | no next file with comments »