diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
| commit | dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch) | |
| tree | 8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/user_script_master.cc | |
| parent | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff) | |
| download | chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2 | |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16295003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master.cc')
| -rw-r--r-- | chrome/browser/extensions/user_script_master.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 9be695f..5de1010 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_); |