Purge AppListMenu, and the app list profile switcher

ui/app_list/views/search_box_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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/resources/grit/app_list_resources.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
-#include "ui/app_list/views/app_list_menu_views.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/shadow_border.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 16;
 const int kInnerPadding = 24;
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
-// Menu offset relative to the bottom-right corner of the menu button.
-const int kMenuYOffsetFromButton = -4;
-const int kMenuXOffsetFromButton = -7;
-
 const int kBackgroundBorderCornerRadius = 2;
 
 // A background that paints a solid white rounded rect with a thin grey border.
 class ExperimentalSearchBoxBackground : public views::Background {
  public:
   ExperimentalSearchBoxBackground() {}
   ~ExperimentalSearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
@@ skipping 54 matching lines @@
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       content_container_(new views::View),
       icon_view_(NULL),
       back_button_(NULL),
       speech_button_(NULL),
-      menu_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL),
       focused_view_(FOCUS_SEARCH_BOX) {
   SetLayoutManager(new views::FillLayout);
   AddChildView(content_container_);
 
   if (switches::IsExperimentalAppListEnabled()) {
     SetShadow(GetShadowForZHeight(2));
     back_button_ = new SearchBoxImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 26 matching lines @@
   search_box_->SetBorder(views::Border::NullBorder());
   search_box_->SetTextColor(kSearchTextColor);
   search_box_->SetBackgroundColor(kSearchBoxBackground);
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->set_controller(this);
   search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH);
   search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
   content_container_->AddChildView(search_box_);
   layout->SetFlexForView(search_box_, 1);
 
-#if !defined(OS_CHROMEOS)
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  menu_button_ = new views::MenuButton(base::string16(), this, false);
-  menu_button_->SetBorder(views::Border::NullBorder());
-  menu_button_->SetImage(views::Button::STATE_NORMAL,
-                         *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
-  menu_button_->SetImage(views::Button::STATE_HOVERED,
-                         *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
-  menu_button_->SetImage(views::Button::STATE_PRESSED,
-                         *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_PRESSED));
-  content_container_->AddChildView(menu_button_);
-#endif
-
   view_delegate_->GetSpeechUI()->AddObserver(this);
   ModelChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   view_delegate_->GetSpeechUI()->RemoveObserver(this);
   model_->search_box()->RemoveObserver(this);
 }
 
 void SearchBoxView::ModelChanged() {
@@ skipping 14 matching lines @@
 
 void SearchBoxView::ClearSearch() {
   search_box_->SetText(base::string16());
   view_delegate_->AutoLaunchCanceled();
   // Updates model and fires query changed manually because SetText() above
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
 }
 
-void SearchBoxView::InvalidateMenu() {
-  menu_.reset();
-}
-
 void SearchBoxView::SetShadow(const gfx::ShadowValue& shadow) {
   SetBorder(base::WrapUnique(new views::ShadowBorder(shadow)));
   Layout();
 }
 
 gfx::Rect SearchBoxView::GetViewBoundsForSearchBoxContentsBounds(
     const gfx::Rect& rect) const {
   gfx::Rect view_bounds = rect;
   view_bounds.Inset(-GetInsets());
   return view_bounds;
@@ skipping 91 matching lines @@
 
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
 
   return false;
 }
 
 void SearchBoxView::OnEnabledChanged() {
   search_box_->SetEnabled(enabled());
-  if (menu_button_)
-    menu_button_->SetEnabled(enabled());
   if (speech_button_)
     speech_button_->SetEnabled(enabled());
 }
 
 void SearchBoxView::UpdateModel() {
   // Temporarily remove from observer to ignore notifications caused by us.
   model_->search_box()->RemoveObserver(this);
   model_->search_box()->SetText(search_box_->text());
   model_->search_box()->SetSelectionModel(search_box_->GetSelectionModel());
   model_->search_box()->AddObserver(this);
@@ skipping 65 matching lines @@
 void SearchBoxView::ButtonPressed(views::Button* sender,
                                   const ui::Event& event) {
   if (back_button_ && sender == back_button_)
     delegate_->BackButtonPressed();
   else if (speech_button_ && sender == speech_button_)
     view_delegate_->StartSpeechRecognition();
   else
     NOTREACHED();
 }
 
-void SearchBoxView::OnMenuButtonClicked(views::MenuButton* source,
-                                        const gfx::Point& point,
-                                        const ui::Event* event) {
-  if (!menu_)
-    menu_.reset(new AppListMenuViews(view_delegate_));
-
-  const gfx::Point menu_location =
-      menu_button_->GetBoundsInScreen().bottom_right() +
-      gfx::Vector2d(kMenuXOffsetFromButton, kMenuYOffsetFromButton);
-  menu_->RunMenuAt(menu_button_, menu_location);
-}
-
 void SearchBoxView::IconChanged() {
   if (icon_view_)
     icon_view_->SetImage(model_->search_box()->icon());
 }
 
 void SearchBoxView::SpeechRecognitionButtonPropChanged() {
   const SearchBoxModel::SpeechButtonProperty* speech_button_prop =
       model_->search_box()->speech_button();
   if (speech_button_prop) {
     if (!speech_button_) {
@@ skipping 37 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list