Move Range code to gfx.

ui/views/controls/textfield/native_textfield_win.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/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/win/tsf_bridge.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/range/range.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
+#include "ui/gfx/range/range.h"
 #include "ui/native_theme/native_theme_win.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/metrics.h"
@@ skipping 295 matching lines @@
   HIMC imm_context = ImmGetContext(m_hWnd);
   if (!imm_context)
     return false;
 
   const int composition_size = ImmGetCompositionString(imm_context, GCS_COMPSTR,
                                                        NULL, 0);
   ImmReleaseContext(m_hWnd, imm_context);
   return composition_size > 0;
 }
 
-ui::Range NativeTextfieldWin::GetSelectedRange() const {
+gfx::Range NativeTextfieldWin::GetSelectedRange() const {
   // TODO(tommi): Implement.
   NOTIMPLEMENTED();
-  return ui::Range();
+  return gfx::Range();
 }
 
-void NativeTextfieldWin::SelectRange(const ui::Range& range) {
+void NativeTextfieldWin::SelectRange(const gfx::Range& range) {
   // TODO(tommi): Implement.
   NOTIMPLEMENTED();
 }
 
 gfx::SelectionModel NativeTextfieldWin::GetSelectionModel() const {
   // TODO(tommi): Implement.
   NOTIMPLEMENTED();
   return gfx::SelectionModel();
 }
 
@@ skipping 34 matching lines @@
 }
 
 ui::TextInputClient* NativeTextfieldWin::GetTextInputClient() {
   return NULL;
 }
 
 void NativeTextfieldWin::SetColor(SkColor value) {
   NOTREACHED();
 }
 
-void NativeTextfieldWin::ApplyColor(SkColor value, const ui::Range& range) {
+void NativeTextfieldWin::ApplyColor(SkColor value, const gfx::Range& range) {
   NOTREACHED();
 }
 
 void NativeTextfieldWin::SetStyle(gfx::TextStyle style, bool value) {
   NOTREACHED();
 }
 
 void NativeTextfieldWin::ApplyStyle(gfx::TextStyle style,
                                     bool value,
-                                    const ui::Range& range) {
+                                    const gfx::Range& range) {
   NOTREACHED();
 }
 
 void NativeTextfieldWin::ClearEditHistory() {
   NOTREACHED();
 }
 
 int NativeTextfieldWin::GetFontHeight() {
   return textfield_->font_list().GetHeight();
 }
@@ skipping 61 matching lines @@
     case IDS_APP_UNDO:       Undo();           break;
     case IDS_APP_CUT:        Cut();            break;
     case IDS_APP_COPY:       Copy();           break;
     case IDS_APP_PASTE:      Paste();          break;
     case IDS_APP_SELECT_ALL: SelectAll(false); break;
     default:                 NOTREACHED();     break;
   }
   OnAfterPossibleChange(true);
 }
 
-void NativeTextfieldWin::OnTextUpdated(const ui::Range& composition_range) {
+void NativeTextfieldWin::OnTextUpdated(const gfx::Range& composition_range) {
   if (ime_discard_composition_) {
     ime_composition_start_ = composition_range.start();
     ime_composition_length_ = composition_range.length();
   } else {
     ime_composition_start_ = 0;
     ime_composition_length_ = 0;
   }
   OnAfterPossibleChange(false);
   text_before_change_.clear();
 }
@@ skipping 803 matching lines @@
     return true;
   MSG msg(*GetCurrentMessage());
   // ATL doesn't set the |time| field.
   if (!msg.time)
     msg.time = GetMessageTime();
   ui::MouseEvent mouse_event(msg);
   return !controller->HandleMouseEvent(textfield_, mouse_event);
 }
 
 }  // namespace views