chrome/browser/extensions/user_script_master.cc - Issue 16295003: Update chrome/ 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: chrome/browser/extensions/user_script_master.cc

Issue 16295003: Update chrome/ 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, 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/updater/extension_updater_unittest.cc ('k') | chrome/browser/extensions/web_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/user_script_master.cc

diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc

index 9be695ffe21c98ca38467127aaad3c2495d0b385..5de101083e2763f547bc675f67a5e730733516d1 100644

--- a/chrome/browser/extensions/user_script_master.cc

+++ b/chrome/browser/extensions/user_script_master.cc

@@ -325,7 +325,7 @@ UserScriptMaster::UserScriptMaster(Profile* profile)

}

UserScriptMaster::~UserScriptMaster() {

- if (script_reloader_)

+ if (script_reloader_.get())

script_reloader_->DisownMaster();

}

@@ -417,7 +417,7 @@ void UserScriptMaster::Observe(int type,

}

if (should_start_load) {

- if (script_reloader_) {

+ if (script_reloader_.get()) {

pending_load_ = true;

} else {

StartLoad();

@@ -426,7 +426,7 @@ void UserScriptMaster::Observe(int type,

}

void UserScriptMaster::StartLoad() {

- if (!script_reloader_)

+ if (!script_reloader_.get())

script_reloader_ = new ScriptReloader(this);

script_reloader_->StartLoad(user_scripts_, extensions_info_);