0

Build browser_main_loop.cc on iOS.

Adds browser_main_loop.cc to the build on iOS and ifdefs out the parts that are
not supported on iOS.


Review URL: https://chromiumcodereview.appspot.com/11087007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161362 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
msarda@chromium.org
2012-10-11 17:05:30 +00:00
parent 45df03fa72
commit a34087bd0f
2 changed files with 8 additions and 1 deletions

@ -67,7 +67,7 @@
#if defined(OS_LINUX)
#include "content/browser/device_monitor_linux.h"
#elif defined(OS_MACOSX)
#elif defined(OS_MACOSX) && !defined(OS_IOS)
#include "content/browser/device_monitor_mac.h"
#endif
@ -236,7 +236,9 @@ BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
BrowserMainLoop::~BrowserMainLoop() {
DCHECK_EQ(this, g_current_browser_main_loop);
#if !defined(OS_IOS)
ui::Clipboard::DestroyClipboardForCurrentThread();
#endif // !defined(OS_IOS)
g_current_browser_main_loop = NULL;
}
@ -614,9 +616,11 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
// more head start for those operations to finish.
BrowserThreadImpl::ShutdownThreadPool();
#if !defined(OS_IOS)
// Must happen after the I/O thread is shutdown since this class lives on the
// I/O thread and isn't threadsafe.
GamepadService::GetInstance()->Terminate();
#endif // !defined(OS_IOS)
if (parts_.get())
parts_->PostDestroyThreads();
@ -661,6 +665,7 @@ void BrowserMainLoop::BrowserThreadsStarted() {
speech_recognition_manager_.reset(new speech::SpeechRecognitionManagerImpl());
#endif
#if !defined(OS_IOS)
// Alert the clipboard class to which threads are allowed to access the
// clipboard:
std::vector<base::PlatformThreadId> allowed_clipboard_threads;
@ -672,6 +677,7 @@ void BrowserMainLoop::BrowserThreadsStarted() {
allowed_clipboard_threads.push_back(io_thread_->thread_id());
#endif
ui::Clipboard::SetAllowedThreads(allowed_clipboard_threads);
#endif // !defined(OS_IOS)
}
void BrowserMainLoop::InitializeToolkit() {

@ -873,6 +873,7 @@
['include', '^public/browser/notification_registrar\\.cc$'],
['include', '^public/browser/speech_recognition_'],
['include', '^browser/browser_context\\.cc$'],
['include', '^browser/browser_main_loop\\.cc$'],
['include', '^browser/browser_process_sub_thread\\.cc$'],
['include', '^browser/notification_service_impl\\.cc$'],
],