Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/chromium/ui/views/controls/textfield/native_textfield_views.h b/chromium/ui/views/controls/textfield/native_textfield_views.h
index 3230fb4d6c8..6b1c2de3724 100644
--- a/chromium/ui/views/controls/textfield/native_textfield_views.h
+++ b/chromium/ui/views/controls/textfield/native_textfield_views.h
@@ -8,10 +8,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/touch/touch_editing_controller.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/font.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"
@@ -130,8 +130,8 @@ class VIEWS_EXPORT NativeTextfieldViews : public View,
   virtual View* GetView() OVERRIDE;
   virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
   virtual bool IsIMEComposing() const OVERRIDE;
-  virtual ui::Range GetSelectedRange() const OVERRIDE;
-  virtual void SelectRange(const ui::Range& range) OVERRIDE;
+  virtual gfx::Range GetSelectedRange() const OVERRIDE;
+  virtual void SelectRange(const gfx::Range& range) OVERRIDE;
   virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;
   virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;
   virtual size_t GetCursorPosition() const OVERRIDE;
@@ -143,17 +143,18 @@ class VIEWS_EXPORT NativeTextfieldViews : public View,
   virtual void HandleBlur() OVERRIDE;
   virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual void SetColor(SkColor value) OVERRIDE;
-  virtual void ApplyColor(SkColor value, const ui::Range& range) OVERRIDE;
+  virtual void ApplyColor(SkColor value, const gfx::Range& range) OVERRIDE;
   virtual void SetStyle(gfx::TextStyle style, bool value) OVERRIDE;
   virtual void ApplyStyle(gfx::TextStyle style,
                           bool value,
-                          const ui::Range& range) OVERRIDE;
+                          const gfx::Range& range) OVERRIDE;
   virtual void ClearEditHistory() OVERRIDE;
   virtual int GetFontHeight() OVERRIDE;
   virtual int GetTextfieldBaseline() const OVERRIDE;
   virtual int GetWidthNeededForText() const OVERRIDE;
   virtual void ExecuteTextCommand(int command_id) OVERRIDE;
   virtual bool HasTextBeingDragged() OVERRIDE;
+  virtual gfx::Point GetContextMenuLocation() OVERRIDE;
 
   // ui::SimpleMenuModel::Delegate overrides
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
@@ -191,12 +192,12 @@ class VIEWS_EXPORT NativeTextfieldViews : public View,
   virtual bool GetCompositionCharacterBounds(uint32 index,
                                              gfx::Rect* rect) OVERRIDE;
   virtual bool HasCompositionText() OVERRIDE;
-  virtual bool GetTextRange(ui::Range* range) OVERRIDE;
-  virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;
-  virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
-  virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
-  virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
-  virtual bool GetTextFromRange(const ui::Range& range,
+  virtual bool GetTextRange(gfx::Range* range) OVERRIDE;
+  virtual bool GetCompositionTextRange(gfx::Range* range) OVERRIDE;
+  virtual bool GetSelectionRange(gfx::Range* range) OVERRIDE;
+  virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
+  virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
+  virtual bool GetTextFromRange(const gfx::Range& range,
                                 string16* text) OVERRIDE;
   virtual void OnInputMethodChanged() OVERRIDE;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
@@ -325,7 +326,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public View,
   size_t aggregated_clicks_;
   base::TimeDelta last_click_time_;
   gfx::Point last_click_location_;
-  ui::Range double_click_word_;
+  gfx::Range double_click_word_;
 
   // Context menu and its content list for the textfield.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;