diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 20:17:19 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 20:17:19 +0000 |
| commit | d957b10b257ff0df7e656fa0e2224b93dcfb6835 (patch) | |
| tree | e7a3e56c08d15f43e9a6916dd0cb0c76f680f216 /content/browser/browser_main_runner.cc | |
| parent | ffe1703ca46a7bb0098d7e4a2f0be7e4387d6b82 (diff) | |
| download | chromium_src-d957b10b257ff0df7e656fa0e2224b93dcfb6835.zip chromium_src-d957b10b257ff0df7e656fa0e2224b93dcfb6835.tar.gz chromium_src-d957b10b257ff0df7e656fa0e2224b93dcfb6835.tar.bz2 | |
content: Terminate early if the toolkit initialization fails.
On Chrome OS, it is possible for chrome to start without the X11
server (e.g. X server has crashed, and hasn't restarted since). In
such cases, Chrome ends up causing a crash. So instead of the crash,
abort the startup sequence if the toolkit initialization step fails.
BUG=364929
R=jam@chromium.org
Review URL: https://codereview.chromium.org/250723002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
| -rw-r--r-- | content/browser/browser_main_runner.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index 1f64412..16309de 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -84,7 +84,8 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { main_loop_->EarlyInitialization(); // Must happen before we try to use a message loop or display any UI. - main_loop_->InitializeToolkit(); + if (!main_loop_->InitializeToolkit()) + return 1; main_loop_->MainMessageLoopStart(); |