Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: content/browser/browser_main_loop.cc

Issue 11087007: Build browser_main_loop.cc on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: After gclient sync and resolve conflict. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index b3cfb9c3101373ce53ecde1e62eb2b5226ec037a..b49a8436ec48d074c2835130f7b8eb2a783df23d 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
@@ -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() {
« no previous file with comments | « no previous file | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698