diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 02:07:45 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 02:07:45 +0000 |
| commit | 69c88e180549a1156037f22bd46f4937d3c1d3d7 (patch) | |
| tree | b607fbf8926b50c2f3c1a3fb3d596fd72946df55 /base | |
| parent | 7fc6fbd11c6e57a80b41ab09d2caf968bb92cb5d (diff) | |
| download | chromium_src-69c88e180549a1156037f22bd46f4937d3c1d3d7.zip chromium_src-69c88e180549a1156037f22bd46f4937d3c1d3d7.tar.gz chromium_src-69c88e180549a1156037f22bd46f4937d3c1d3d7.tar.bz2 | |
Remove obsolete usage of TOUCH_UI.
BUG=105046
TEST=none
Review URL: http://codereview.chromium.org/8660001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/linux_util.cc | 4 | ||||
| -rw-r--r-- | base/message_loop.cc | 2 | ||||
| -rw-r--r-- | base/message_loop.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/base/linux_util.cc b/base/linux_util.cc index 751b28f..247580d 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -131,8 +131,8 @@ static const int kDistroSize = 128 + 1; // We use this static string to hold the Linux distro info. If we // crash, the crash handler code will send this in the crash dump. char g_linux_distro[kDistroSize] = -#if defined(OS_CHROMEOS) && defined(TOUCH_UI) - "CrOS Touch"; +#if defined(OS_CHROMEOS) && defined(USE_AURA) + "CrOS Aura"; #elif defined(OS_CHROMEOS) "CrOS"; #else // if defined(OS_LINUX) diff --git a/base/message_loop.cc b/base/message_loop.cc index 3ff2068..ca85d6a 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -153,7 +153,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) || defined(USE_AURA) +#elif 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 95fae1b..ffa5aae 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -33,7 +33,7 @@ #if defined(USE_WAYLAND) #include "base/message_pump_wayland.h" -#elif defined(TOUCH_UI) || defined(USE_AURA) +#elif defined(USE_AURA) #include "base/message_pump_x.h" #else #include "base/message_pump_gtk.h" |