diff options
| author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:40:59 +0000 |
|---|---|---|
| committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:40:59 +0000 |
| commit | 47dd834a8190a25d884813a5a0f7594ca3ca70c4 (patch) | |
| tree | cfdc62abdc7f226c90f8937c1cb07dc528066a37 /chrome/browser/chrome_browser_main.cc | |
| parent | b172be456e69b47fe314615d60cdb6825c598983 (diff) | |
| download | chromium_src-47dd834a8190a25d884813a5a0f7594ca3ca70c4.zip chromium_src-47dd834a8190a25d884813a5a0f7594ca3ca70c4.tar.gz chromium_src-47dd834a8190a25d884813a5a0f7594ca3ca70c4.tar.bz2 | |
Suppress CHECK failure in CreateProfile for OS_WIN.
The CHECK(profile) was only intended for platforms other than Windows.
Prior to my fix for bug 196301, the intended behavior is for CreateProfile
to return NULL and allow Chrome to normally exit, because after showing
the user data dir picker dialog we would have already re-launched Chrome
with a new command line containing the correct user data dir.
BUG=230442
TEST=CQ
Review URL: https://chromiumcodereview.appspot.com/14109008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 4290390..16aef29 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -365,10 +365,12 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters, if (profile) return profile; +#if !defined(OS_WIN) // TODO(port): fix this. See comments near the definition of // user_data_dir. It is better to CHECK-fail here than it is to // silently exit because of missing code in the above test. CHECK(profile) << "Cannot get default profile."; +#endif return NULL; } |