Remove more totally obvious usage of: defined(TOUCH_UI)

BUG=105046
TEST=none


Review URL: http://codereview.chromium.org/8656004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111282 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -40,7 +40,7 @@
 #endif
 
 class MessageLoopObserver : public MessageLoopForUI::Observer {
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE {
     return base::EVENT_CONTINUE;

chrome/browser/chromeos/frame/browser_view.cc

@@ -568,7 +568,7 @@ void BrowserView::ButtonVisibilityChanged(views::View* button_view) {
 
 // BrowserView, MessageLoopForUI::Observer implementation.
 
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
 base::EventStatus BrowserView::WillProcessEvent(
     const base::NativeEvent& event) OVERRIDE {
   return base::EVENT_CONTINUE;

chrome/browser/chromeos/frame/browser_view.h

@@ -97,7 +97,7 @@ class BrowserView : public ::BrowserView,
   virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
 
   // MessageLoopForUI::Observer overrides.
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
   // MessageLoopForUI::Observer overrides.
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE;

chrome/browser/chromeos/frame/panel_controller.cc

@@ -267,7 +267,7 @@ bool PanelController::TitleMousePressed(const views::MouseEvent& event) {
   mouse_down_offset_y_ = event.y();
   dragging_ = false;
 
-#if !defined(TOUCH_UI) && !defined(USE_AURA)
+#if defined(TOOLKIT_USES_GTK)
   const GdkEvent* gdk_event = event.gdk_event();
   GdkEventButton last_button_event = gdk_event->button;
   mouse_down_abs_x_ = last_button_event.x_root;

chrome/browser/chromeos/notifications/notification_panel.cc

@@ -459,7 +459,7 @@ void NotificationPanel::Show() {
 
     panel_widget_->SetContentsView(scroll_view_.get());
 
-#if defined(USE_AURA) || defined(TOUCH_UI)
+#if defined(USE_AURA)
     native->AttachToView(balloon_container_.get());
 #else
     // Add the view port after scroll_view is attached to the panel widget.

chrome/browser/notifications/balloon_collection_impl.h

@@ -63,7 +63,7 @@ class BalloonCollectionImpl : public BalloonCollection,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // MessageLoopForUI::Observer interface.
-#if defined(OS_WIN) || defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(OS_WIN) || defined(USE_AURA)
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE;
   virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;

chrome/browser/ui/panels/panel_browser_frame_view.cc

@@ -186,7 +186,7 @@ void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(
       break;
   }
 }
-#elif defined(TOUCH_UI) || defined(USE_AURA)
+#elif defined(USE_AURA)
 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent(
     const base::NativeEvent& event) {
   return base::EVENT_CONTINUE;

chrome/browser/ui/panels/panel_browser_frame_view.h

@@ -114,7 +114,7 @@ class PanelBrowserFrameView : public BrowserNonClientFrameView,
 
     virtual bool IsCursorInViewBounds() const;
 
-  #if defined(OS_WIN) || defined(TOUCH_UI) || defined(USE_AURA)
+  #if defined(OS_WIN) || defined(USE_AURA)
     virtual base::EventStatus WillProcessEvent(
         const base::NativeEvent& event) OVERRIDE;
     virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;

chrome/browser/ui/panels/panel_browser_view_browsertest.cc

@@ -50,7 +50,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
       MSG msg;
       msg.message = WM_MOUSEMOVE;
       DidProcessEvent(msg);
-#elif defined(TOUCH_UI) || defined(USE_AURA)
+#elif defined(USE_AURA)
       NOTIMPLEMENTED();
 #elif defined(TOOLKIT_USES_GTK)
       GdkEvent event;

chrome/browser/ui/webui/chrome_url_data_manager_backend.cc

@@ -74,7 +74,7 @@ class ChromeURLContentSecurityPolicyExceptionSet
 #if defined(TOUCH_UI)
     insert(chrome::kChromeUIKeyboardHost);
 #endif
-#if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(OS_CHROMEOS) || defined(USE_AURA)
     insert(chrome::kChromeUICollectedCookiesHost);
     insert(chrome::kChromeUIHttpAuthHost);
     insert(chrome::kChromeUIRepostFormWarningHost);

ui/views/focus/accelerator_handler.h

@@ -20,13 +20,11 @@
 
 namespace views {
 
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#if defined(USE_X11) && !defined(USE_WAYLAND)
+#if defined(USE_AURA) && defined(USE_X11) && !defined(USE_WAYLAND)
 // Dispatch an XEvent to the RootView. Return true if the event was dispatched
 // and handled, false otherwise.
 bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
-#endif  // USE_X11 && !USE_WAYLAND
-#endif  // TOUCH_UI || USE_AURA
+#endif  // USE_AURA && USE_X11 && !USE_WAYLAND
 
 // This class delegates the key messages to the associated FocusManager class
 // for the window that is receiving these messages for accelerator processing.
@@ -41,7 +39,7 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
 #elif defined(USE_WAYLAND)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
       base::wayland::WaylandEvent* ev);
-#elif defined(TOUCH_UI) || defined(USE_AURA)
+#elif defined(USE_AURA)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
 #else
   virtual bool Dispatch(GdkEvent* event);

ui/views/ime/input_method_ibus.cc

@@ -28,7 +28,7 @@
 #include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA) || defined(TOUCH_UI)
+#if defined(USE_AURA)
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ -799,7 +799,7 @@ void InputMethodIBus::OnForwardKeyEvent(IBusInputContext* context,
   DCHECK_EQ(context_, context);
 
   ui::KeyboardCode key_code = ui::VKEY_UNKNOWN;
-#if defined(USE_AURA) || defined(TOUCH_UI)
+#if defined(USE_AURA)
   key_code = ui::KeyboardCodeFromXKeysym(keyval);
 #elif defined(TOOLKIT_USES_GTK)
   key_code = ui::WindowsKeyCodeForGdkKeyCode(keyval);