Remove GetWidth() and GetTextWidth() from OmniboxView.

These methods are only implemented and used by OmniboxViewViews, so
they are removed from the base class.

Bug: 329527
Change-Id: I47bb17b9f51bc623383525181128c7ec5c3e8c40
Reviewed-on: https://chromium-review.googlesource.com/c/1429986
Auto-Submit: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626142}

chrome/browser/ui/views/omnibox/omnibox_view_views.h

@@ -96,6 +96,13 @@ class OmniboxViewViews : public OmniboxView,
   bool SelectionAtBeginning() const;
   bool SelectionAtEnd() const;
 
+  // Returns the width in pixels needed to display the current text. The
+  // returned value includes margins.
+  int GetTextWidth() const;
+
+  // Returns the omnibox's width in pixels.
+  int GetWidth() const;
+
   // OmniboxView:
   void EmphasizeURLComponents() override;
   void Update() override;
@@ -114,7 +121,6 @@ class OmniboxViewViews : public OmniboxView,
   void SelectAll(bool reversed) override;
   void RevertAll() override;
   void SetFocus() override;
-  int GetTextWidth() const override;
   bool IsImeComposing() const override;
 
   // views::Textfield:
@@ -211,7 +217,6 @@ class OmniboxViewViews : public OmniboxView,
   bool OnAfterPossibleChange(bool allow_keyword_ui_change) override;
   gfx::NativeView GetNativeView() const override;
   gfx::NativeView GetRelativeWindowForPopup() const override;
-  int GetWidth() const override;
   bool IsImeShowingPopup() const override;
   void ShowVirtualKeyboardIfEnabled() override;
   void HideImeIfNeeded() override;

components/omnibox/browser/omnibox_view.h

@@ -194,13 +194,6 @@ class OmniboxView {
   // the top-most window is the relative window.
   virtual gfx::NativeView GetRelativeWindowForPopup() const = 0;
 
-  // Returns the width in pixels needed to display the current text. The
-  // returned value includes margins.
-  virtual int GetTextWidth() const = 0;
-
-  // Returns the omnibox's width in pixels.
-  virtual int GetWidth() const = 0;
-
   // Returns true if the user is composing something in an IME.
   virtual bool IsImeComposing() const = 0;
 

components/omnibox/browser/test_omnibox_view.cc

@@ -79,14 +79,6 @@ gfx::NativeView TestOmniboxView::GetRelativeWindowForPopup() const {
   return nullptr;
 }
 
-int TestOmniboxView::GetTextWidth() const {
-  return 0;
-}
-
-int TestOmniboxView::GetWidth() const {
-  return 0;
-}
-
 bool TestOmniboxView::IsImeComposing() const {
   return false;
 }

components/omnibox/browser/test_omnibox_view.h

@@ -62,8 +62,6 @@ class TestOmniboxView : public OmniboxView {
   bool OnAfterPossibleChange(bool allow_keyword_ui_change) override;
   gfx::NativeView GetNativeView() const override;
   gfx::NativeView GetRelativeWindowForPopup() const override;
-  int GetTextWidth() const override;
-  int GetWidth() const override;
   bool IsImeComposing() const override;
   int GetOmniboxTextLength() const override;
   void EmphasizeURLComponents() override {}

ios/chrome/browser/ui/omnibox/omnibox_view_ios.h

@@ -91,8 +91,6 @@ class OmniboxViewIOS : public OmniboxView,
   void OnRevertTemporaryText() override {}
   gfx::NativeView GetNativeView() const override;
   gfx::NativeView GetRelativeWindowForPopup() const override;
-  int GetTextWidth() const override;
-  int GetWidth() const override;
 
   // AutocompleteTextFieldDelegate methods
   void OnDidBeginEditing();

ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm

@@ -392,15 +392,6 @@ gfx::NativeView OmniboxViewIOS::GetRelativeWindowForPopup() const {
   return nullptr;
 }
 
-int OmniboxViewIOS::GetTextWidth() const {
-  return 0;
-}
-
-// TODO(crbug.com/329527): [Merge r241107] implement OmniboxViewIOS::GetWidth().
-int OmniboxViewIOS::GetWidth() const {
-  return 0;
-}
-
 void OmniboxViewIOS::OnDidBeginEditing() {
   // Reset the changed flag.
   omnibox_interacted_while_focused_ = NO;