Refactored touch-events flag test, correcting "enabled" logic.

chrome/browser/ui/views/omnibox/omnibox_view_win.cc

 // Copyright 2012 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 "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 43 matching lines @@
 #include "ui/base/dragdrop/drop_target_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/ime/win/tsf_event_router.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/touch/touch_enabled.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/base/win/touch_input.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/textfield/native_textfield_win.h"
 #include "ui/views/widget/widget.h"
@@ skipping 1360 matching lines @@
     DoCopyURL(url, text);
   else
     DoCopyText(text);
 }
 
 LRESULT OmniboxViewWin::OnCreate(const CREATESTRUCTW* /*create_struct*/) {
   if (base::win::IsTSFAwareRequired()) {
     // Enable TSF support of RichEdit.
     SetEditStyle(SES_USECTF, SES_USECTF);
   }
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+  if ((base::win::GetVersion() >= base::win::VERSION_WIN8) &&
+      ui::AreTouchEventsEnabled()) {
     BOOL touch_mode = RegisterTouchWindow(m_hWnd, TWF_WANTPALM);
     DCHECK(touch_mode);
   }
   SetMsgHandled(FALSE);
 
   // When TSF is enabled, OnTextUpdated() may be called without any previous
   // call that would have indicated the start of an editing session.  In order
   // to guarantee we've always called OnBeforePossibleChange() before
   // OnAfterPossibleChange(), we therefore call that here.  Note that multiple
   // (i.e. unmatched) calls to this function in a row are safe.
@@ skipping 1369 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of PosFromChar(GetTextLength()) because
   // PosFromChar() is apparently buggy. In both LTR UI and RTL UI with
   // left-to-right layout, PosFromChar(i) might return 0 when i is greater than
   // 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }