diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
| commit | 4a6bef33b6897ceff27eee304afe1a6da5fee4ff (patch) | |
| tree | 64c7e2cb508ccbe6a9e50be1da7c99b016ea5b52 /base | |
| parent | ccb824344b58ae4acbc0b7b30ebcba048a032836 (diff) | |
| download | chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.zip chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.gz chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.bz2 | |
aura: A few changes to have aura_demo compile and run on linux.
* Make 'aura' a component, and export Desktop and Window.
* Events (Key and Mouse) from X Events.
* Rip non-gtk bits out of gfx/gtk_util into gfx/linux_util
BUG=93934,93933
TEST=none
Review URL: http://codereview.chromium.org/7833016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 2 | ||||
| -rw-r--r-- | base/message_loop.cc | 2 | ||||
| -rw-r--r-- | base/message_loop.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/base.gypi b/base/base.gypi index 5aed38c..f1fbb98 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -383,7 +383,7 @@ 'message_pump_x.cc', ], }], - [ 'touchui==0', { + [ 'touchui==0 and use_aura==0', { 'sources!' : [ 'message_pump_x.cc', ], }, { 'sources!' : [ 'message_pump_gtk.cc', ], diff --git a/base/message_loop.cc b/base/message_loop.cc index 19ce904..4a206e9 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -151,7 +151,7 @@ MessageLoop::MessageLoop(Type type) #elif defined(USE_WAYLAND) #define MESSAGE_PUMP_UI new base::MessagePumpWayland() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() -#elif defined(TOUCH_UI) +#elif defined(TOUCH_UI) || defined(USE_AURA) #define MESSAGE_PUMP_UI new base::MessagePumpX() #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() #elif defined(OS_NACL) diff --git a/base/message_loop.h b/base/message_loop.h index 601120f..4742b5f 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -31,7 +31,7 @@ #if defined(USE_WAYLAND) #include "base/message_pump_wayland.h" -#elif defined(TOUCH_UI) +#elif defined(TOUCH_UI) || defined(USE_AURA) #include "base/message_pump_x.h" #else #include "base/message_pump_gtk.h" |