views: Moves TextfieldController/TextRange into their own headers.

chrome/browser/ui/views/find_bar_view.h

 // Copyright (c) 2011 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_FIND_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
 #pragma once
 
 #include "base/string16.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "ui/gfx/size.h"
 #include "views/controls/button/button.h"
 #include "views/controls/textfield/textfield.h"

[sky, 2011/03/09 17:02:33]

Can you nuke the textfield include now?

[tfarina, 2011/03/09 17:31:06]

No, we inherit from views::Textfield at line 114.

+#include "views/controls/textfield/textfield_controller.h"
 
 class FindBarHost;
 
 namespace views {
 class ImageButton;
 class Label;
 class MouseEvent;
 class View;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The FindBarView is responsible for drawing the UI controls of the
 // FindBar, the find text box, the 'Find' button and the 'Close'
 // button. It communicates the user search words to the FindBarHost.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class FindBarView : public DropdownBarView,
                     public views::ButtonListener,
-                    public views::Textfield::Controller {
+                    public views::TextfieldController {
  public:
   // A tag denoting which button the user pressed.
   enum ButtonTag {
     FIND_PREVIOUS_TAG = 0,  // The Find Previous button.
     FIND_NEXT_TAG,          // The Find Next button.
     CLOSE_TAG,              // The Close button (the 'X').
   };
 
   explicit FindBarView(FindBarHost* host);
   virtual ~FindBarView();
@@ skipping 12 matching lines @@
   // active item and how many matches were found.
   void UpdateForResult(const FindNotificationDetails& result,
                        const string16& find_text);
 
   // Clears the current Match Count value in the Find text box.
   void ClearMatchCount();
 
   // Claims focus for the text field and selects its contents.
   virtual void SetFocusAndSelection(bool select_all);
 
-  // Overridden from views::View:
+  // views::View:
   virtual void OnPaint(gfx::Canvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
 
-  // Overridden from views::ButtonListener:
+  // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
-  // Overridden from views::Textfield::Controller:
+  // views::TextfieldController:
   virtual void ContentsChanged(views::Textfield* sender,
                                const string16& new_contents);
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const views::KeyEvent& key_event);
 
  private:
   // Update the appearance for the match count label.
   void UpdateMatchCountAppearance(bool no_match);
 
   // Overridden from views::View.
@@ skipping 50 matching lines @@
   views::Label* match_count_text_;
   FocusForwarderView* focus_forwarder_view_;
   views::ImageButton* find_previous_button_;
   views::ImageButton* find_next_button_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(FindBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_