Remove app/win/win_util.h,cc etc.

chrome/browser/autocomplete/autocomplete_edit_view_win.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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
 #include <richedit.h>
 #include <textserv.h>
 
 #include "app/win/iat_patch_function.h"
-#include "app/win/win_util.h"
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_accessibility.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 17 matching lines @@
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/drop_target.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "views/controls/textfield/native_textfield_win.h"
 #include "views/drag_utils.h"
 #include "views/focus/focus_util_win.h"
 #include "views/widget/widget.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel
 
@@ skipping 191 matching lines @@
   AutocompleteEditState(const AutocompleteEditModel::State model_state,
                         const AutocompleteEditViewWin::State view_state)
       : model_state(model_state),
         view_state(view_state) {
   }
 
   const AutocompleteEditModel::State model_state;
   const AutocompleteEditViewWin::State view_state;
 };
 
+// Returns true if the current point is far enough from the origin that it
+// would be considered a drag.
+bool IsDrag(const POINT& origin, const POINT& current) {
+  // The CXDRAG and CYDRAG system metrics describe the width and height of a
+  // rectangle around the origin position, inside of which motion is not
+  // considered a drag.
+  return (abs(current.x - origin.x) > (GetSystemMetrics(SM_CXDRAG) / 2)) ||
+         (abs(current.y - origin.y) > (GetSystemMetrics(SM_CYDRAG) / 2));
+}
+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper classes
 
 AutocompleteEditViewWin::ScopedFreeze::ScopedFreeze(
     AutocompleteEditViewWin* edit,
     ITextDocument* text_object_model)
     : edit_(edit),
       text_object_model_(text_object_model) {
@@ skipping 683 matching lines @@
   if (CanPasteAndGo(text))
     model_->PasteAndGo();
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& e) {
   ui::KeyboardCode key = e.GetKeyCode();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
   if (e.IsAltDown() && (key != ui::VKEY_HOME) &&
-      app::win::IsNumPadDigit(key, e.IsExtendedKey()))
+      views::NativeTextfieldWin::IsNumPadDigit(key, e.IsExtendedKey()))
     return true;
 
   // Skip accelerators for key combinations omnibox wants to crack. This list
   // should be synced with OnKeyDownOnlyWritable() (but for tab which is dealt
   // with above in LocationBarView::SkipDefaultKeyEventProcessing).
   //
   // We cannot return true for all keys because we still need to handle some
   // accelerators (e.g., F5 for reload the page should work even when the
   // Omnibox gets focused).
   switch (key) {
@@ skipping 475 matching lines @@
     // (as well as a matching WM_LBUTTONUP, just in case we'd be confusing some
     // kind of state tracking otherwise).
     DefWindowProc(WM_LBUTTONDOWN, keys, MAKELPARAM(point.x, point.y));
     DefWindowProc(WM_LBUTTONUP, keys, MAKELPARAM(point.x, point.y));
   }
 
   // Check for triple click, then reset tracker.  Should be safe to subtract
   // double_click_time_ from the current message's time even if the timer has
   // wrapped in between.
   const bool is_triple_click = tracking_double_click_ &&
-      app::win::IsDoubleClick(double_click_point_, point,
-                              GetCurrentMessage()->time - double_click_time_);
+      views::NativeTextfieldWin::IsDoubleClick(double_click_point_, point,
+          GetCurrentMessage()->time - double_click_time_);
   tracking_double_click_ = false;
 
   if (!gaining_focus_.get() && !is_triple_click)
     OnPossibleDrag(point);
 
 
   // Modifying the selection counts as accepting any inline autocompletion, so
   // track "changes" made by clicking the mouse button.
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
@@ skipping 78 matching lines @@
 }
 
 void AutocompleteEditViewWin::OnMouseMove(UINT keys, const CPoint& point) {
   if (possible_drag_) {
     StartDragIfNecessary(point);
     // Don't fall through to default mouse handling, otherwise a second
     // drag session may start.
     return;
   }
 
-  if (tracking_click_[kLeft] && !app::win::IsDrag(click_point_[kLeft], point))
+  if (tracking_click_[kLeft] && !IsDrag(click_point_[kLeft], point))
     return;
 
   tracking_click_[kLeft] = false;
 
   // Return quickly if this can't change the selection/cursor, so we don't
   // create a ScopedFreeze (and thus do an UpdateWindow()) on every
   // WM_MOUSEMOVE.
   if (!(keys & MK_LBUTTON)) {
     DefWindowProc(WM_MOUSEMOVE, keys, MAKELPARAM(point.x, point.y));
     return;
@@ skipping 795 matching lines @@
     if (ole_interface) {
       ole_interface.QueryInterface(
           __uuidof(ITextDocument),
           reinterpret_cast<void**>(&text_object_model_));
     }
   }
   return text_object_model_;
 }
 
 void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) {
-  if (initiated_drag_ || !app::win::IsDrag(click_point_[kLeft], point))
+  if (initiated_drag_ || !IsDrag(click_point_[kLeft], point))
     return;
 
   ui::OSExchangeData data;
 
   DWORD supported_modes = DROPEFFECT_COPY;
 
   CHARRANGE sel;
   GetSelection(sel);
 
   // We're about to start a drag session, but the edit is expecting a mouse up
@@ skipping 136 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }
 
 void AutocompleteEditViewWin::SelectAllIfNecessary(MouseButton button,
                                                    const CPoint& point) {
   // When the user has clicked and released to give us focus, select all.
   if (tracking_click_[button] &&
-      !app::win::IsDrag(click_point_[button], point)) {
+      !IsDrag(click_point_[button], point)) {
     // Select all in the reverse direction so as not to scroll the caret
     // into view and shift the contents jarringly.
     SelectAll(true);
     possible_drag_ = false;
   }
 }
 
 void AutocompleteEditViewWin::TrackMousePosition(MouseButton button,
                                                  const CPoint& point) {
   if (gaining_focus_.get()) {
@@ skipping 14 matching lines @@
 }
 
 int AutocompleteEditViewWin::WidthNeededToDisplay(
     const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->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();
 }