diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 22:45:15 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 22:45:15 +0000 |
| commit | dfca51a8801c7be9db5cb59de202dc0e0c91ccda (patch) | |
| tree | 97d1da099502ede9cf176be622c9355ef5c060e0 /ash | |
| parent | cfe8004738d9a05e733a7527730e0e712ef22c92 (diff) | |
| download | chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.zip chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.tar.gz chromium_src-dfca51a8801c7be9db5cb59de202dc0e0c91ccda.tar.bz2 | |
Revert 263726 "x11: Remove X11 message-pump."
Reason for revert: along with 263718 blamed for
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/45298
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/29956
> 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
>
> Review URL: https://codereview.chromium.org/235043005
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/238093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263733 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 6891419..98f7346 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 "ui/gfx/x/x11_types.h" +#include "base/message_loop/message_pump_x11.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 61fa218..49f1d08 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 "ui/gfx/x/x11_connection.h" +#include <X11/Xlib.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. - gfx::InitializeThreadedX11(); + XInitThreads(); #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 5eee024..5084e7c 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 "ui/gfx/x/x11_types.h" +#include "base/message_loop/message_pump_x11.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(gfx::GetXDisplay(), + XWarpPointer(base::MessagePumpX11::GetDefaultXDisplay(), None, window->GetHost()->GetAcceleratedWidget(), 0, 0, 0, 0, |