summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-20 23:25:17 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-20 23:25:17 +0000
commit9571882bad4ee9f944448b1ea0403e7ee21377dc (patch)
tree53dcca0429dc9b6f74cc02305dcfa3c74c4e2982 /chrome
parentb401d45e53da4f199514f36b8fbf52514c10cd2e (diff)
downloadchromium_src-9571882bad4ee9f944448b1ea0403e7ee21377dc.zip
chromium_src-9571882bad4ee9f944448b1ea0403e7ee21377dc.tar.gz
chromium_src-9571882bad4ee9f944448b1ea0403e7ee21377dc.tar.bz2
Crash fix for mounting GData provider in incognito mode.
BUG=chromium-os:28123 TEST=open guest session or incognito mode, make sure file manager does not crash there Review URL: https://chromiumcodereview.appspot.com/9777002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_private_api.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 4dd503d..858d649 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -992,9 +992,11 @@ bool AddMountFunction::RunImpl() {
case chromeos::MOUNT_TYPE_GDATA: {
gdata::GDataFileSystem* file_system =
gdata::GDataFileSystemFactory::GetForProfile(profile_);
- file_system->Authenticate(
- base::Bind(&AddMountFunction::OnGDataAuthentication,
- this));
+ if (file_system) {
+ file_system->Authenticate(
+ base::Bind(&AddMountFunction::OnGDataAuthentication,
+ this));
+ }
break;
}
default: {