diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 01:32:32 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 01:32:32 +0000 |
| commit | e544c099d9f78b76799335648977bc7e62d0f0cb (patch) | |
| tree | 3f5394e2460d21a56700e320388beb55d63eba65 /chrome/browser/chromeos/gdata/drive_file_system.h | |
| parent | 4106828279eaf917ff6d4d5f8545227615e62b72 (diff) | |
| download | chromium_src-e544c099d9f78b76799335648977bc7e62d0f0cb.zip chromium_src-e544c099d9f78b76799335648977bc7e62d0f0cb.tar.gz chromium_src-e544c099d9f78b76799335648977bc7e62d0f0cb.tar.bz2 | |
drive: Fix a crash caused by an empty edit URL
For some reason, edit URL can be null in some entries, which
causes a crash.
Along the way, make |callback| parameter of DriveFilesystemInterface::Remove()
mandatory. The only caller in gdata_file_system_proxy.cc passes a non-null
callback.
BUG=144993
TEST=remove operation works as before
Review URL: https://chromiumcodereview.appspot.com/10880075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/gdata/drive_file_system.h')
| -rw-r--r-- | chrome/browser/chromeos/gdata/drive_file_system.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/gdata/drive_file_system.h b/chrome/browser/chromeos/gdata/drive_file_system.h index 8245410..3af05ca 100644 --- a/chrome/browser/chromeos/gdata/drive_file_system.h +++ b/chrome/browser/chromeos/gdata/drive_file_system.h @@ -511,7 +511,7 @@ class DriveFileSystem : public DriveFileSystemInterface, // Callback for DriveServiceInterface::DeleteDocument. Removes the entry with // |resource_id| from the local snapshot of the filesystem and the cache. - // |document_url| is unused. |callback| may be null. + // |document_url| is unused. |callback| must not be null. void RemoveResourceLocally(const FileOperationCallback& callback, const std::string& resource_id, GDataErrorCode status, @@ -797,6 +797,7 @@ class DriveFileSystem : public DriveFileSystemInterface, // Part of RemoveOnUIThread(). Called after GetEntryInfoByPath() is // complete. + // |callback| must not be null. void RemoveOnUIThreadAfterGetEntryInfo( const FileOperationCallback& callback, DriveFileError error, |