Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: ui/app_list/views/search_box_view.h

Issue 2127713005: Purge AppListMenu, and the app list profile switcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160707-Apps-RemoveSettings
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/search_box_view.h
diff --git a/ui/app_list/views/search_box_view.h b/ui/app_list/views/search_box_view.h
index 8abee80181359c172148b7dfa70ee035e9b17b74..3ff2242e30b21a3d88c141a5059dd918aa8deb5a 100644
--- a/ui/app_list/views/search_box_view.h
+++ b/ui/app_list/views/search_box_view.h
@@ -12,13 +12,11 @@
#include "ui/app_list/speech_ui_model_observer.h"
#include "ui/gfx/shadow_value.h"
#include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/menu_button_listener.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/view.h"
namespace views {
class ImageView;
-class MenuButton;
class Textfield;
} // namespace views
@@ -33,7 +31,6 @@ enum SearchBoxFocus {
FOCUS_CONTENTS_VIEW, // Something outside the SearchBox is selected
};
-class AppListMenuViews;
class AppListModel;
class AppListViewDelegate;
class SearchBoxModel;
@@ -47,7 +44,6 @@ class SearchBoxImageButton;
class APP_LIST_EXPORT SearchBoxView : public views::View,
public views::TextfieldController,
public views::ButtonListener,
- public views::MenuButtonListener,
public SearchBoxModelObserver,
public SpeechUIModelObserver {
public:
@@ -58,7 +54,6 @@ class APP_LIST_EXPORT SearchBoxView : public views::View,
void ModelChanged();
bool HasSearch() const;
void ClearSearch();
- void InvalidateMenu();
// Sets the shadow border of the search box.
void SetShadow(const gfx::ShadowValue& shadow);
@@ -105,11 +100,6 @@ class APP_LIST_EXPORT SearchBoxView : public views::View,
// Overridden from views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
- // Overridden from views::MenuButtonListener:
- void OnMenuButtonClicked(views::MenuButton* source,
- const gfx::Point& point,
- const ui::Event* event) override;
-
// Overridden from SearchBoxModelObserver:
void IconChanged() override;
void SpeechRecognitionButtonPropChanged() override;
@@ -125,13 +115,10 @@ class APP_LIST_EXPORT SearchBoxView : public views::View,
AppListViewDelegate* view_delegate_; // Not owned.
AppListModel* model_; // Owned by the profile-keyed service.
- std::unique_ptr<AppListMenuViews> menu_;
-
views::View* content_container_; // Owned by views hierarchy.
views::ImageView* icon_view_; // Owned by views hierarchy.
SearchBoxImageButton* back_button_; // Owned by views hierarchy.
SearchBoxImageButton* speech_button_; // Owned by views hierarchy.
- views::MenuButton* menu_button_; // Owned by views hierarchy.
views::Textfield* search_box_; // Owned by views hierarchy.
views::View* contents_view_; // Owned by views hierarchy.
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698