summaryrefslogtreecommitdiffstats
path: root/chrome/browser/custom_handlers
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 04:20:03 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 04:20:03 +0000
commit27af383b79a59f3c947e68a1c05f919678883d4f (patch)
tree3a00745da1cdc81e4f5f323b33a40965cbdf3177 /chrome/browser/custom_handlers
parent0d321df097b9355ce073906581b2c5e6524c4f0a (diff)
downloadchromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.zip
chromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.tar.gz
chromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.tar.bz2
Use an X event loop in the GPU process on Linux.
In future patches, X windows will be created in the GPU process, and events sent to these windows will need to be forwarded to their parent windows. Linux uses GTK as the default UI event loop type, but GTK is not in the GPU process, so the X11 event loop type is used instead. BUG=145600 Review URL: https://chromiumcodereview.appspot.com/23477050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_handlers')
-rw-r--r--chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 58791d1..75b24ac 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -286,6 +286,9 @@ class TestMessageLoop : public base::MessageLoop {
virtual ~TestMessageLoop() {}
virtual bool IsType(base::MessageLoop::Type type) const OVERRIDE {
switch (type) {
+#if defined(TOOLKIT_GTK)
+ case base::MessageLoop::TYPE_GPU:
+#endif
case base::MessageLoop::TYPE_UI:
return BrowserThread::CurrentlyOn(BrowserThread::UI);
case base::MessageLoop::TYPE_IO: