Merge AutocompleteTextfield views::Textfield subclass into OmniboxView.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "ui/base/range/range.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #endif
 
 class LocationBarView;
 class OmniboxPopupView;
 class Profile;
 
 namespace ui {
 class OSExchangeData;
 }  // namespace ui
 
 // Views-implementation of OmniboxView. This is based on gtk implementation.
-// The following features are not yet supported.
-//
-// LTR support.
-// Drag and drop behavior.
-// Adjust paste behavior (should not autocomplete).
-// Custom context menu for omnibox.
-// Instant.

[Peter Kasting, 2013/02/18 18:57:47]

Are these all fixed, then?

[msw, 2013/02/18 20:58:21]

All of these are supported except perhaps Instant, I'll leave that note.

 class OmniboxViewViews
-    : public views::View,
+    : public views::Textfield,
       public OmniboxView,
 #if defined(OS_CHROMEOS)
       public
           chromeos::input_method::InputMethodManager::CandidateWindowObserver,
 #endif
       public views::TextfieldController {
  public:
   // The internal view class name.
   static const char kViewClassName[];
 
   OmniboxViewViews(OmniboxEditController* controller,
                    ToolbarModel* toolbar_model,
                    Profile* profile,
                    CommandUpdater* command_updater,
                    bool popup_window_mode,
                    LocationBarView* location_bar);
   virtual ~OmniboxViewViews();
 
   // Initialize, create the underlying views, etc;
   void Init();
 
   // Sets the colors of the text view according to the theme.
   void SetBaseColor();
 
-  // Called after key even is handled either by HandleKeyEvent or by Textfield.
-  bool HandleAfterKeyEvent(const ui::KeyEvent& event, bool handled);
-
-  // Called when KeyRelease event is generated on textfield.
-  bool HandleKeyReleaseEvent(const ui::KeyEvent& event);
-
-  // Called when mouse events are generated on the textfield.
-  // The views::Textfield implementations will be executed first.
-  void HandleMousePressEvent(const ui::MouseEvent& event);
-  void HandleMouseDragEvent(const ui::MouseEvent& event);
-  void HandleMouseReleaseEvent(const ui::MouseEvent& event);
-
-  // Called when a gesture event is generated on textfield.
-  void HandleGestureEvent(const ui::GestureEvent& event);
-
-  // Called when Focus is set/unset on textfield.
-  void HandleFocusIn();
-  void HandleFocusOut();
-
-  // Sets whether the location entry can accept focus.
-  void SetLocationEntryFocusable(bool focusable);
-
-  // Returns true if the location entry is focusable and visible in
-  // the root view.
-  bool IsLocationEntryFocusableInRootView() const;
-
-  // Implements views::View
-  virtual void Layout() OVERRIDE;
+  // views::View:

[Peter Kasting, 2013/02/18 18:57:47]

Nit: We don't directly override View, perhaps this should be "//
views::Textfield:"

[msw, 2013/02/18 20:58:21]

Done.

+  virtual std::string GetClassName() const OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual std::string GetClassName() const OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
+  virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
+  virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
+  virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
+  virtual void OnFocus() OVERRIDE;
+  virtual void OnBlur() OVERRIDE;
 
   // OmniboxView:
   virtual void SaveStateToTab(content::WebContents* tab) OVERRIDE;
   virtual void Update(
       const content::WebContents* tab_for_state_restoring) OVERRIDE;
   virtual string16 GetText() const OVERRIDE;
   virtual void SetWindowTextAndCaretPos(const string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
                                         bool notify_text_changed) OVERRIDE;
@@ skipping 49 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // chromeos::input_method::InputMethodManager::CandidateWindowObserver:
   virtual void CandidateWindowOpened(
       chromeos::input_method::InputMethodManager* manager) OVERRIDE;
   virtual void CandidateWindowClosed(
       chromeos::input_method::InputMethodManager* manager) OVERRIDE;
 #endif
 
  private:
-  class AutocompleteTextfield;
-
   // Return the number of characers in the current buffer.
   virtual int GetOmniboxTextLength() const OVERRIDE;
-  size_t GetTextLength() const;
 
   // Try to parse the current text as a URL and colorize the components.
   virtual void EmphasizeURLComponents() OVERRIDE;
 
   // Update the field with |text| and set the selection.
   void SetTextAndSelectedRange(const string16& text,
                                const ui::Range& range);
 
   // Returns the selected text.
   string16 GetSelectedText() const;
 
   // Copy the URL instead of the text in the textfield into clipboard.
   void CopyURL();
 
   // Paste text from the clipboard into the omnibox.
   // Textfields implementation of Paste() pastes the contents of the clipboard
   // as is. We want to strip whitespace and other things (see GetClipboardText()
   // for details).
   // It is assumed this is invoked after a call to OnBeforePossibleChange() and
   // that after invoking this OnAfterPossibleChange() is invoked.
   void OnPaste();
 
-  views::Textfield* textfield_;
-
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (smaller font size). This is used for popups.
   bool popup_window_mode_;
 
   scoped_ptr<OmniboxPopupView> popup_view_;
 
   ToolbarModel::SecurityLevel security_level_;
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
@@ skipping 21 matching lines @@
 
   // Indicates if we want to select all text in the omnibox when we get a
   // GESTURE_TAP. We want to select all only when the textfield is not in focus
   // and gets a tap. So we use this variable to remember focus state before tap.
   bool select_all_on_gesture_tap_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_