summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 21:27:56 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 21:27:56 +0000
commitf1ccb86565dcdd1523fa5fdc0a2f273cc4e9cb9f (patch)
treebdfed7e1b4f7cdaef766b9fc14022b4203e2d1e9 /chrome/browser/chrome_browser_main.cc
parentd36a2ac7e11b57719587881008d822f949bc9afc (diff)
downloadchromium_src-f1ccb86565dcdd1523fa5fdc0a2f273cc4e9cb9f.zip
chromium_src-f1ccb86565dcdd1523fa5fdc0a2f273cc4e9cb9f.tar.gz
chromium_src-f1ccb86565dcdd1523fa5fdc0a2f273cc4e9cb9f.tar.bz2
Revise user-data-dir switch handling; avoid crashes.
Chrome needs a pre-existing or creatable user-data-dir to run. ChromeMainDelegate::PreSandboxStartup was CHECK'ing for this. (crashing on startup with --user-data-dir="M:\invalid") (crashing on startup with --user-data-dir="C:\windows") Supposedly, we had a dialog to let users choose another dir. (I've never gotten this to work on M28-M32 stable versions) Revise the user-data-dir code to warn on invalid paths. (see crbug.com/318999#c18 for the warning screenshot) Then attempt to use the default directory as a backup. (no alternate dir selection UI, users can try again) This should avoid many of the numerous related crashes. BUG=318999 TEST=Supplying an invalid --user-data-dir=<path> will warn users and attempt to use the default directory instead of silently crashing. R=sky@chromium.org Review URL: https://codereview.chromium.org/123693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r--chrome/browser/chrome_browser_main.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 11672b2..295c4bb 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -99,7 +99,6 @@
#include "chrome/browser/ui/startup/default_browser_prompt.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/uma_browsing_activity_observer.h"
-#include "chrome/browser/ui/user_data_dir_dialog.h"
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
#include "chrome/browser/user_data_dir_extractor.h"
#include "chrome/common/chrome_constants.h"