summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 01:12:05 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 01:12:05 +0000
commit9866f34453d1a173446d91a3e71fdc1fb746d6fe (patch)
tree8eed9715018729864c2f066d9c10ba440138526b /chrome/browser/extensions
parent4fa52530e921ffe34ebf8b426eb50a206c4c9842 (diff)
downloadchromium_src-9866f34453d1a173446d91a3e71fdc1fb746d6fe.zip
chromium_src-9866f34453d1a173446d91a3e71fdc1fb746d6fe.tar.gz
chromium_src-9866f34453d1a173446d91a3e71fdc1fb746d6fe.tar.bz2
Fix DCHECK when handling NOTIFY_USER_SCRIPTS_LOADED by not broadcasting the
message if we don't have any scripts. Review URL: http://codereview.chromium.org/19441 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/user_script_master.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index 66a8d70..86f5668 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -102,6 +102,8 @@ void UserScriptMaster::ScriptReloader::NotifyMaster(
void UserScriptMaster::ScriptReloader::RunScan(
const FilePath script_dir, const UserScriptList lone_scripts) {
base::SharedMemory* shared_memory = GetNewScripts(script_dir, lone_scripts);
+ if (!shared_memory)
+ return; // No scripts to load.
// Post the new scripts back to the master's message loop.
master_message_loop_->PostTask(FROM_HERE,