Chromium Code Reviews| Index: chrome/browser/ui/views/find_bar_view.h |
| diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h |
| index 5386ec6bc0418ca995783b22a04fac78d25513f7..3bf76dd2be9864aa2e57c2afdcdb08f707f4c9bd 100644 |
| --- a/chrome/browser/ui/views/find_bar_view.h |
| +++ b/chrome/browser/ui/views/find_bar_view.h |
| @@ -10,9 +10,10 @@ |
| #include "base/compiler_specific.h" |
| #include "base/macros.h" |
| #include "base/strings/string16.h" |
| -#include "chrome/browser/ui/views/dropdown_bar_view.h" |
| +#include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" |
| #include "ui/views/controls/button/vector_icon_button_delegate.h" |
| #include "ui/views/controls/textfield/textfield_controller.h" |
| +#include "ui/views/view.h" |
| #include "ui/views/view_targeter_delegate.h" |
| class FindBarHost; |
| @@ -38,7 +39,8 @@ class VectorIconButton; |
| // button. It communicates the user search words to the FindBarHost. |
| // |
| //////////////////////////////////////////////////////////////////////////////// |
| -class FindBarView : public DropdownBarView, |
| +class FindBarView : public views::View, |
| + public DropdownBarHostDelegate, |
| public views::VectorIconButtonDelegate, |
| public views::TextfieldController, |
| public views::ViewTargeterDelegate { |
| @@ -69,7 +71,7 @@ class FindBarView : public DropdownBarView, |
| // Claims focus for the text field and selects its contents. |
|
Peter Kasting
2016/10/21 21:07:50
Nit: Change to "DropdownBarHostDelegate:"
Reorder
Evan Stade
2016/10/21 22:11:11
Done.
|
| void SetFocusAndSelection(bool select_all) override; |
| - // DropdownBarView: |
| + // views::View: |
| void Layout() override; |
| gfx::Size GetPreferredSize() const override; |
| @@ -100,9 +102,9 @@ class FindBarView : public DropdownBarView, |
| // Returns the color for the icons on the buttons per the current NativeTheme. |
| SkColor GetTextColorForIcon(); |
| - // Returns the OS-specific view for the find bar that acts as an intermediary |
| + // The OS-specific view for the find bar that acts as an intermediary |
| // between us and the WebContentsView. |
| - FindBarHost* find_bar_host() const; |
| + FindBarHost* find_bar_host_; |
| // Used to detect if the input text, not including the IME composition text, |
| // has changed or not. |