Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 1a4153e6bd431ea18682176a494bf287e6cf8e13..000e1b49dd2febeeb47bba380d8810f27c07a69e 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -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 |
@@ -240,7 +240,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; |
} |
@@ -618,9 +620,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(); |
@@ -675,7 +679,9 @@ void BrowserMainLoop::BrowserThreadsStarted() { |
allowed_clipboard_threads.push_back(file_thread_->thread_id()); |
allowed_clipboard_threads.push_back(io_thread_->thread_id()); |
#endif |
+#if !defined(OS_IOS) |
stuartmorgan
2012/10/08 13:59:39
Move this up to the beginning of the block (just b
msarda
2012/10/08 14:05:39
Done.
|
ui::Clipboard::SetAllowedThreads(allowed_clipboard_threads); |
+#endif // !defined(OS_IOS) |
} |
void BrowserMainLoop::InitializeToolkit() { |