Move Range code to gfx.

content/browser/renderer_host/gtk_im_context_wrapper.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 "content/browser/renderer_host/gtk_im_context_wrapper.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 421 matching lines @@
                                         event->state,
                                         base::Time::Now().ToDoubleT());
       char_event.skip_in_browser = true;
       host_view_->ForwardKeyboardEvent(char_event);
     } else {
       committed = true;
       // Send an IME event.
       // Unlike a Char event, an IME event is NOT dispatched to onkeypress()
       // handlers or autofill.
       host->ImeConfirmComposition(
-          commit_text_,ui::Range::InvalidRange(),false);
+          commit_text_,gfx::Range::InvalidRange(),false);
       // Set this flag to false, as this composition session has been
       // finished.
       is_composing_text_ = false;
     }
   }
 
   // Send preedit text only if it's changed.
   // If a text has been committed, then we don't need to send the empty
   // preedit text again.
   if (is_composition_changed_) {
@@ skipping 17 matching lines @@
 void GtkIMContextWrapper::ConfirmComposition() {
   if (!is_enabled_)
     return;
 
   DCHECK(!is_in_key_event_handler_);
 
   if (is_composing_text_) {
     if (host_view_->GetRenderWidgetHost()) {
       RenderWidgetHostImpl::From(
           host_view_->GetRenderWidgetHost())->ImeConfirmComposition(
-              string16(), ui::Range::InvalidRange(), false);
+              string16(), gfx::Range::InvalidRange(), false);
     }
 
     // Reset the input method.
     CancelComposition();
   }
 }
 
 void GtkIMContextWrapper::HandleCommit(const string16& text) {
   if (suppress_next_commit_)
     return;
 
   // Append the text to the buffer, because commit signal might be fired
   // multiple times when processing a key event.
   commit_text_.append(text);
   // Nothing needs to do, if it's currently in ProcessKeyEvent()
   // handler, which will send commit text to webkit later. Otherwise,
   // we need send it here.
   // It's possible that commit signal is fired without a key event, for
   // example when user input via a voice or handwriting recognition software.
   // In this case, the text must be committed directly.
   if (!is_in_key_event_handler_ && host_view_->GetRenderWidgetHost()) {
     // Workaround http://crbug.com/45478 by sending fake key down/up events.
     SendFakeCompositionKeyEvent(WebKit::WebInputEvent::RawKeyDown);
     RenderWidgetHostImpl::From(
         host_view_->GetRenderWidgetHost())->ImeConfirmComposition(
-            text, ui::Range::InvalidRange(), false);
+            text, gfx::Range::InvalidRange(), false);
     SendFakeCompositionKeyEvent(WebKit::WebInputEvent::KeyUp);
   }
 }
 
 void GtkIMContextWrapper::HandlePreeditStart() {
   // Ignore preedit related signals triggered by CancelComposition() method.
   if (suppress_next_commit_)
     return;
   is_composing_text_ = true;
 }
 
 void GtkIMContextWrapper::HandlePreeditChanged(const gchar* text,
                                                PangoAttrList* attrs,
                                                int cursor_position) {
   // Ignore preedit related signals triggered by CancelComposition() method.
   if (suppress_next_commit_)
     return;
 
   // Don't set is_composition_changed_ to false if there is no change, because
   // this handler might be called multiple times with the same data.
   is_composition_changed_ = true;
   composition_.Clear();
 
   ui::ExtractCompositionTextFromGtkPreedit(text, attrs, cursor_position,
                                            &composition_);
 
   // TODO(suzhe): due to a bug of webkit, we currently can't use selection range
   // with composition string. See: https://bugs.webkit.org/show_bug.cgi?id=40805
-  composition_.selection = ui::Range(cursor_position);
+  composition_.selection = gfx::Range(cursor_position);
 
   // In case we are using a buggy input method which doesn't fire
   // "preedit_start" signal.
   if (composition_.text.length())
     is_composing_text_ = true;
 
   // Nothing needs to do, if it's currently in ProcessKeyEvent()
   // handler, which will send preedit text to webkit later.
   // Otherwise, we need send it here if it's been changed.
   if (!is_in_key_event_handler_ && is_composing_text_ &&
@@ skipping 110 matching lines @@
     GtkWidget* widget, GtkIMContextWrapper* self) {
   self->HandleHostViewRealize(widget);
 }
 
 void GtkIMContextWrapper::HandleHostViewUnrealizeThunk(
     GtkWidget* widget, GtkIMContextWrapper* self) {
   self->HandleHostViewUnrealize();
 }
 
 }  // namespace content