diff options
| author | hashimoto <hashimoto@chromium.org> | 2015-04-13 21:32:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-14 04:32:34 +0000 |
| commit | e0e304c2f1490610927a1e19487a6d7ae8a434c7 (patch) | |
| tree | da98c81fc063630816fb20ada708a91945c5e034 /chrome/browser/browser_process_impl.cc | |
| parent | d40cd5eb1dff50a8ee00f834dbfd4df3bfa2cf81 (diff) | |
| download | chromium_src-e0e304c2f1490610927a1e19487a6d7ae8a434c7.zip chromium_src-e0e304c2f1490610927a1e19487a6d7ae8a434c7.tar.gz chromium_src-e0e304c2f1490610927a1e19487a6d7ae8a434c7.tar.bz2 | |
Fix BrowserProcessImpl::EndSession() for freon-enabled environment
BUG=472981
Review URL: https://codereview.chromium.org/1079093002
Cr-Commit-Position: refs/heads/master@{#324999}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index b373810..254d2ef 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -152,7 +152,7 @@ static const int kUpdateCheckIntervalHours = 6; #endif -#if defined(USE_X11) || defined(OS_WIN) +#if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE) // How long to wait for the File thread to complete during EndSession, on Linux // and Windows. We have a timeout here because we're unable to run the UI // messageloop and there's some deadlock risk. Our only option is to exit @@ -498,7 +498,7 @@ void BrowserProcessImpl::EndSession() { // // If you change the condition here, be sure to also change // ProfileBrowserTests to match. -#if defined(USE_X11) || defined(OS_WIN) +#if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE) // Do a best-effort wait on the successful countdown of rundown tasks. Note // that if we don't complete "quickly enough", Windows will terminate our // process. |