Remove some more !IsModeMaterial code.

chrome/browser/ui/views/find_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/number_formatting.h"
 #include "base/macros.h"
@@ skipping 93 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FocusForwarderView);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, public:
 
 FindBarView::FindBarView(FindBarHost* host)
-    : DropdownBarView(host),
+    : find_bar_host_(host),
       find_text_(new views::Textfield),
       match_count_text_(new MatchCountLabel()),
       focus_forwarder_view_(new FocusForwarderView(find_text_)),
       separator_(new views::Separator(views::Separator::VERTICAL)),
       find_previous_button_(new views::VectorIconButton(this)),
       find_next_button_(new views::VectorIconButton(this)),
       close_button_(new views::VectorIconButton(this)) {
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   find_text_->set_default_width_in_chars(kDefaultCharWidth);
   find_text_->set_controller(this);
@@ skipping 111 matching lines @@
   SchedulePaint();
 }
 
 void FindBarView::ClearMatchCount() {
   match_count_text_->SetText(base::string16());
   UpdateMatchCountAppearance(false);
   Layout();
   SchedulePaint();
 }
 
-void FindBarView::SetFocusAndSelection(bool select_all) {
-  find_text_->RequestFocus();
-  GetWidget()->GetInputMethod()->ShowImeIfNeeded();
-  if (select_all && !find_text_->text().empty())
-    find_text_->SelectAll(true);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::View overrides:
 
 void FindBarView::Layout() {
   views::View::Layout();
 
   // The focus forwarder view is a hidden view that should cover the area
   // between the find text box and the find button so that when the user clicks
   // in that area we focus on the find text box.
   const int find_text_edge = find_text_->x() + find_text_->width();
   focus_forwarder_view_->SetBounds(
       find_text_edge, find_previous_button_->y(),
       find_previous_button_->x() - find_text_edge,
       find_previous_button_->height());
 }
 
 gfx::Size FindBarView::GetPreferredSize() const {
   gfx::Size size = views::View::GetPreferredSize();
   // Ignore the preferred size for the match count label, and just let it take
   // up part of the space for the input textfield. This prevents the overall
   // width from changing every time the match count text changes.
   size.set_width(size.width() - match_count_text_->GetPreferredSize().width());
   return size;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// FindBarView, DropdownBarHostDelegate implementation:
+
+void FindBarView::SetFocusAndSelection(bool select_all) {
+  find_text_->RequestFocus();
+  GetWidget()->GetInputMethod()->ShowImeIfNeeded();
+  if (select_all && !find_text_->text().empty())
+    find_text_->SelectAll(true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::VectorIconButtonDelegate implementation:
 
 void FindBarView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   switch (sender->id()) {
     case VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON:
     case VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON:
       if (!find_text_->text().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
-            find_bar_host()->GetFindBarController()->web_contents());
+            find_bar_host_->GetFindBarController()->web_contents());
         find_tab_helper->StartFinding(
             find_text_->text(),
             sender->id() == VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON,
             false);  // Not case sensitive.
       }
       break;
     case VIEW_ID_FIND_IN_PAGE_CLOSE_BUTTON:
-      find_bar_host()->GetFindBarController()->EndFindSession(
+      find_bar_host_->GetFindBarController()->EndFindSession(
           FindBarController::kKeepSelectionOnPage,
           FindBarController::kKeepResultsInFindBox);
       break;
     default:
       NOTREACHED() << "Unknown button";
       break;
   }
 }
 
 SkColor FindBarView::GetVectorIconBaseColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::TextfieldController implementation:
 
 bool FindBarView::HandleKeyEvent(views::Textfield* sender,
                                  const ui::KeyEvent& key_event) {
   // If the dialog is not visible, there is no reason to process keyboard input.
-  if (!host()->IsVisible())
+  if (!find_bar_host_->IsVisible())
     return false;
 
-  if (find_bar_host()->MaybeForwardKeyEventToWebpage(key_event))
+  if (find_bar_host_->MaybeForwardKeyEventToWebpage(key_event))
     return true;  // Handled, we are done!
 
   if (key_event.key_code() == ui::VKEY_RETURN &&
       key_event.type() == ui::ET_KEY_PRESSED) {
     // Pressing Return/Enter starts the search (unless text box is empty).
     base::string16 find_string = find_text_->text();
     if (!find_string.empty()) {
-      FindBarController* controller = find_bar_host()->GetFindBarController();
+      FindBarController* controller = find_bar_host_->GetFindBarController();
       FindTabHelper* find_tab_helper =
           FindTabHelper::FromWebContents(controller->web_contents());
       // Search forwards for enter, backwards for shift-enter.
       find_tab_helper->StartFinding(find_string,
                                     !key_event.IsShiftDown(),
                                     false);  // Not case sensitive.
     }
     return true;
   }
 
@@ skipping 13 matching lines @@
   // See http://crbug.com/79002
   last_searched_text_.clear();
 }
 
 views::View* FindBarView::TargetForRect(View* root, const gfx::Rect& rect) {
   DCHECK_EQ(match_count_text_, root);
   return find_text_;
 }
 
 void FindBarView::Find(const base::string16& search_text) {
-  FindBarController* controller = find_bar_host()->GetFindBarController();
+  FindBarController* controller = find_bar_host_->GetFindBarController();
   DCHECK(controller);
   content::WebContents* web_contents = controller->web_contents();
   // We must guard against a NULL web_contents, which can happen if the text
   // in the Find box is changed right after the tab is destroyed. Otherwise, it
   // can lead to crashes, as exposed by automation testing in issue 8048.
   if (!web_contents)
     return;
   FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(web_contents);
 
   last_searched_text_ = search_text;
 
   // When the user changes something in the text box we check the contents and
   // if the textbox contains something we set it as the new search string and
   // initiate search (even though old searches might be in progress).
   if (!search_text.empty()) {
     // The last two params here are forward (true) and case sensitive (false).
     find_tab_helper->StartFinding(search_text, true, false);
   } else {
     find_tab_helper->StopFinding(FindBarController::kClearSelectionOnPage);
     UpdateForResult(find_tab_helper->find_result(), base::string16());
-    find_bar_host()->MoveWindowIfNecessary(gfx::Rect());
+    find_bar_host_->MoveWindowIfNecessary(gfx::Rect());
 
     // Clearing the text box should clear the prepopulate state so that when
     // we close and reopen the Find box it doesn't show the search we just
     // deleted. We can't do this on ChromeOS yet because we get ContentsChanged
     // sent for a lot more things than just the user nulling out the search
     // terms. See http://crbug.com/45372.
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     FindBarState* find_bar_state = FindBarStateFactory::GetForProfile(profile);
     find_bar_state->set_last_prepopulate_text(base::string16());
   }
 }
 
 void FindBarView::UpdateMatchCountAppearance(bool no_match) {
   bool enable_buttons = !find_text_->text().empty() && !no_match;
   find_previous_button_->SetEnabled(enable_buttons);
   find_next_button_->SetEnabled(enable_buttons);
 }
 
-FindBarHost* FindBarView::find_bar_host() const {
-  return static_cast<FindBarHost*>(host());
-}
-
 const char* FindBarView::GetClassName() const {
   return "FindBarView";
 }
 
 void FindBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   SkColor bg_color = theme->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultBackground);
   auto border = base::MakeUnique<views::BubbleBorder>(
       views::BubbleBorder::NONE, views::BubbleBorder::SMALL_SHADOW,
       bg_color);
   set_background(new views::BubbleBackground(border.get()));
   SetBorder(std::move(border));
 
   match_count_text_->SetBackgroundColor(bg_color);
   SkColor text_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldDefaultColor);
   match_count_text_->SetEnabledColor(SkColorSetA(text_color, 0x69));
   separator_->SetColor(SkColorSetA(text_color, 0x26));
 }