Move a bunch of windows stuff from ui/base/win to ui/gfx/win

ui/views/controls/textfield/textfield_views_model.cc

 // Copyright (c) 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 "ui/views/controls/textfield/textfield_views_model.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/text/utf16_indexing.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_constants.h"
+#include "ui/gfx/utf16_indexing.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace views {
 
 namespace internal {
 
 // An edit object holds enough information/state to undo/redo the
 // change. Two edits are merged when possible, for example, when
 // you type new characters in sequence.  |Commit()| can be used to
 // mark an edit as an independent edit and it shouldn't be merged.
@@ skipping 346 matching lines @@
     return true;
   }
   if (HasSelection()) {
     DeleteSelection();
     return true;
   }
   size_t cursor_position = GetCursorPosition();
   if (cursor_position > 0) {
     // Delete one code point, which may be two UTF-16 words.
     size_t previous_char =
-        ui::UTF16OffsetToIndex(GetText(), cursor_position, -1);
+        gfx::UTF16OffsetToIndex(GetText(), cursor_position, -1);
     ExecuteAndRecordDelete(gfx::Range(cursor_position, previous_char), true);
     return true;
   }
   return false;
 }
 
 size_t TextfieldViewsModel::GetCursorPosition() const {
   return render_text_->cursor_position();
 }
 
@@ skipping 392 matching lines @@
   if (delete_from != delete_to)
     render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
   if (!new_text.empty())
     render_text_->SetText(text.insert(new_text_insert_at, new_text));
   render_text_->SetCursorPosition(new_cursor_pos);
   // TODO(oshima): mac selects the text that is just undone (but gtk doesn't).
   // This looks fine feature and we may want to do the same.
 }
 
 }  // namespace views