Redo of Issue 8621006: Remove most obvious TOUCH_UI code.

views/controls/menu/menu_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_host.h"
 
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host_root_view.h"
@@ skipping 30 matching lines @@
 
 bool MenuHost::IsMenuHostVisible() {
   return IsVisible();
 }
 
 void MenuHost::ShowMenuHost(bool do_capture) {
   // Doing a capture may make us get capture lost. Ignore it while we're in the
   // process of showing.
   ignore_capture_lost_ = true;
   Show();
-#if defined(TOUCH_UI)
-  Activate();
-#endif
   if (do_capture)
     native_widget_private()->SetMouseCapture();
   ignore_capture_lost_ = false;
 }
 
 void MenuHost::HideMenuHost() {
   ignore_capture_lost_ = true;
   ReleaseMenuHostCapture();
   Hide();
   ignore_capture_lost_ = false;
@@ skipping 40 matching lines @@
   if (!destroying_) {
     // We weren't explicitly told to destroy ourselves, which means the menu was
     // deleted out from under us (the window we're parented to was closed). Tell
     // the SubmenuView to drop references to us.
     submenu_->MenuHostDestroyed();
   }
   Widget::OnNativeWidgetDestroyed();
 }
 
 }  // namespace views