diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 22:19:50 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 22:19:50 +0000 |
commit | cfa428e0e42218b43f0c0b2486d2cc19b675d37d (patch) | |
tree | 7377cebabc3d676447cc1dcd564ec1cb9d17664c /chrome | |
parent | 861d4339e73a774ccd04401e1a90d5b5403e1e3f (diff) | |
download | chromium_src-cfa428e0e42218b43f0c0b2486d2cc19b675d37d.zip chromium_src-cfa428e0e42218b43f0c0b2486d2cc19b675d37d.tar.gz chromium_src-cfa428e0e42218b43f0c0b2486d2cc19b675d37d.tar.bz2 |
Don't DCHECK if a watched directory doesn't exist.
The caller can't easily check whether a directory exists before calling this
functions. Also modify GreasemonkeyMaster to allow this condition.
Review URL: http://codereview.chromium.org/16580
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/greasemonkey_master.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/greasemonkey_master.cc b/chrome/browser/greasemonkey_master.cc index 11c3085..715da54 100644 --- a/chrome/browser/greasemonkey_master.cc +++ b/chrome/browser/greasemonkey_master.cc @@ -168,11 +168,10 @@ GreasemonkeyMaster::GreasemonkeyMaster(MessageLoop* worker_loop, worker_loop_(worker_loop), pending_scan_(false) { // Watch our scripts directory for modifications. - bool ok = dir_watcher_->Watch(script_dir, this); - DCHECK(ok); - - // (Asynchronously) scan for our initial set of scripts. - StartScan(); + if (dir_watcher_->Watch(script_dir, this)) { + // (Asynchronously) scan for our initial set of scripts. + StartScan(); + } } GreasemonkeyMaster::~GreasemonkeyMaster() { |