diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/browser_main_posix.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/browser/browser_main_posix.cc')
| -rw-r--r-- | chrome/browser/browser_main_posix.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/browser_main_posix.cc b/chrome/browser/browser_main_posix.cc index e6675f6..8081ef0 100644 --- a/chrome/browser/browser_main_posix.cc +++ b/chrome/browser/browser_main_posix.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/chrome_thread.h" +#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_switches.h" namespace { @@ -108,10 +108,10 @@ void ShutdownDetector::ThreadMain() { bytes_read += ret; } while (bytes_read < sizeof(signal)); - LOG(INFO) << "Handling shutdown for signal " << signal << "."; + VLOG(1) << "Handling shutdown for signal " << signal << "."; - if (!ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + if (!BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableFunction(BrowserList::CloseAllBrowsersAndExit))) { // Without a UI thread to post the exit task to, there aren't many // options. Raise the signal again. The default handler will pick it up @@ -219,8 +219,8 @@ void BrowserMainPartsPosix::PostMainMessageLoopStart() { } } -// Mac further subclasses BrowserMainPartsPosix -#if !defined(OS_MACOSX) +// Mac and Chromeos further subclass BrowserMainPartsPosix. +#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) // static BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( const MainFunctionParams& parameters) { |