diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 03:34:54 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 03:34:54 +0000 |
| commit | 82f884d6ffb1406788add09179de956d1d53c19a (patch) | |
| tree | 48b1b4dcbed83f1d29ec5075f258dcd2cee45faf /ash | |
| parent | beeac2de62965716b8563f0092bdee8f2038150c (diff) | |
| download | chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.zip chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.tar.gz chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.tar.bz2 | |
x11: Remove X11 message-pump.
The remaining use of the X11 mesage-pump was opening the connection to the
X11 server. This patch moves that out of the message-pump, into gfx. This
allows us to remove the X11 message-pump, and just use the base Glib-based
message-pump on Linux and ChromeOS.
BUG=354062
R=darin@chromium.org, sky@chromium.org
Previously landed in r263726, but reverted in r263733 to allow reverting another CL.
Review URL: https://codereview.chromium.org/235043005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 2 | ||||
| -rw-r--r-- | ash/test/ash_test_base.cc | 4 | ||||
| -rw-r--r-- | ash/wm/ash_native_cursor_manager_interactive_uitest.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 98f7346..6891419 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -114,7 +114,7 @@ #if defined(USE_X11) #include "ash/accelerators/magnifier_key_scroller.h" #include "ash/accelerators/spoken_feedback_toggler.h" -#include "base/message_loop/message_pump_x11.h" +#include "ui/gfx/x/x11_types.h" #endif // defined(USE_X11) #include "ash/ash_constants.h" #include "ash/display/display_change_observer_chromeos.h" diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 49f1d08..61fa218 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -49,7 +49,7 @@ #endif #if defined(USE_X11) -#include <X11/Xlib.h> +#include "ui/gfx/x/x11_connection.h" #endif namespace ash { @@ -98,7 +98,7 @@ AshTestBase::AshTestBase() // This is needed for tests which use this base class but are run in browser // test binaries so don't get the default initialization in the unit test // suite. - XInitThreads(); + gfx::InitializeThreadedX11(); #endif thread_bundle_.reset(new content::TestBrowserThreadBundle); diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc index 5084e7c..5eee024 100644 --- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc +++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc @@ -20,7 +20,7 @@ #if defined(USE_X11) #include <X11/Xlib.h> -#include "base/message_loop/message_pump_x11.h" +#include "ui/gfx/x/x11_types.h" #endif namespace ash { @@ -59,7 +59,7 @@ DisplayInfo CreateDisplayInfo(int64 id, void MoveMouseSync(aura::Window* window, int x, int y) { #if defined(USE_X11) - XWarpPointer(base::MessagePumpX11::GetDefaultXDisplay(), + XWarpPointer(gfx::GetXDisplay(), None, window->GetHost()->GetAcceleratedWidget(), 0, 0, 0, 0, |