Remove some more !IsModeMaterial code.

chrome/browser/ui/views/find_bar_view.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_FIND_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
 
 #include <memory>
 
 #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;
 class FindNotificationDetails;
 
 namespace gfx {
 class Range;
 }
 
 namespace views {
 class Label;
 class MouseEvent;
 class Painter;
 class Separator;
 class Textfield;
 class VectorIconButton;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // 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,
+class FindBarView : public views::View,
+                    public DropdownBarHostDelegate,
                     public views::VectorIconButtonDelegate,
                     public views::TextfieldController,
                     public views::ViewTargeterDelegate {
  public:
   explicit FindBarView(FindBarHost* host);
   ~FindBarView() override;
 
   // Accessors for the text and selection displayed in the text box.
   void SetFindTextAndSelectedRange(const base::string16& find_text,
                                    const gfx::Range& selected_range);
   base::string16 GetFindText() const;
   gfx::Range GetSelectedRange() const;
 
   // Gets the selected text in the text box.
   base::string16 GetFindSelectedText() const;
 
   // Gets the match count text displayed in the text box.
   base::string16 GetMatchCountText() const;
 
   // Updates the label inside the Find text box that shows the ordinal of the
   // active item and how many matches were found.
   void UpdateForResult(const FindNotificationDetails& result,
                        const base::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.

[Peter Kasting, 2016/10/21 21:07:50]

Nit: Change to "DropdownBarHostDelegate:"

Reorder functions here and in .cc to match base class declaration order (or
reorder base class order)

[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;
 
   // views::VectorIconButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
   SkColor GetVectorIconBaseColor() const override;
 
   // views::TextfieldController:
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
@@ skipping 10 matching lines @@
   // Updates the appearance for the match count label.
   void UpdateMatchCountAppearance(bool no_match);
 
   // DropdownBarView:
   const char* GetClassName() const override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // 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.
   base::string16 last_searched_text_;
 
   // The controls in the window.
   views::Textfield* find_text_;
   std::unique_ptr<views::Painter> find_text_border_;
   views::Label* match_count_text_;
   views::View* focus_forwarder_view_;
   views::Separator* separator_;
   views::VectorIconButton* find_previous_button_;
   views::VectorIconButton* find_next_button_;
   views::VectorIconButton* close_button_;
 
   // The preferred height of the find bar.
   int preferred_height_;
 
   DISALLOW_COPY_AND_ASSIGN(FindBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_