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

Side by Side Diff: ui/app_list/views/app_list_view.h

Issue 657653002: Move app list search box into AppListView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 namespace app_list { 29 namespace app_list {
30 class ApplicationDragAndDropHost; 30 class ApplicationDragAndDropHost;
31 class AppListMainView; 31 class AppListMainView;
32 class AppListModel; 32 class AppListModel;
33 class AppListViewDelegate; 33 class AppListViewDelegate;
34 class AppListViewObserver; 34 class AppListViewObserver;
35 class HideViewAnimationObserver; 35 class HideViewAnimationObserver;
36 class PaginationModel; 36 class PaginationModel;
37 class SearchBoxView;
37 class SpeechView; 38 class SpeechView;
38 39
39 // AppListView is the top-level view and controller of app list UI. It creates 40 // AppListView is the top-level view and controller of app list UI. It creates
40 // and hosts a AppsGridView and passes AppListModel to it for display. 41 // and hosts a AppsGridView and passes AppListModel to it for display.
41 class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, 42 class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
42 public AppListViewDelegateObserver, 43 public AppListViewDelegateObserver,
43 public SpeechUIModelObserver { 44 public SpeechUIModelObserver {
44 public: 45 public:
45 // Does not take ownership of |delegate|. 46 // Does not take ownership of |delegate|.
46 explicit AppListView(AppListViewDelegate* delegate); 47 explicit AppListView(AppListViewDelegate* delegate);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 virtual void OnWidgetActivationChanged( 154 virtual void OnWidgetActivationChanged(
154 views::Widget* widget, bool active) override; 155 views::Widget* widget, bool active) override;
155 156
156 // Overridden from SpeechUIModelObserver: 157 // Overridden from SpeechUIModelObserver:
157 virtual void OnSpeechRecognitionStateChanged( 158 virtual void OnSpeechRecognitionStateChanged(
158 SpeechRecognitionState new_state) override; 159 SpeechRecognitionState new_state) override;
159 160
160 AppListViewDelegate* delegate_; // Weak. Owned by AppListService. 161 AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
161 162
162 AppListMainView* app_list_main_view_; 163 AppListMainView* app_list_main_view_;
164 SearchBoxView* search_box_view_;
163 SpeechView* speech_view_; 165 SpeechView* speech_view_;
164 166
165 // The red "experimental" banner for the experimental app list. 167 // The red "experimental" banner for the experimental app list.
166 views::ImageView* experimental_banner_view_; 168 views::ImageView* experimental_banner_view_;
167 169
168 // A semi-transparent white overlay that covers the app list while dialogs are 170 // A semi-transparent white overlay that covers the app list while dialogs are
169 // open. 171 // open.
170 views::View* overlay_view_; 172 views::View* overlay_view_;
171 173
172 ObserverList<AppListViewObserver> observers_; 174 ObserverList<AppListViewObserver> observers_;
173 scoped_ptr<HideViewAnimationObserver> animation_observer_; 175 scoped_ptr<HideViewAnimationObserver> animation_observer_;
174 176
175 // For UMA and testing. If non-null, triggered when the app list is painted. 177 // For UMA and testing. If non-null, triggered when the app list is painted.
176 base::Closure next_paint_callback_; 178 base::Closure next_paint_callback_;
177 179
178 DISALLOW_COPY_AND_ASSIGN(AppListView); 180 DISALLOW_COPY_AND_ASSIGN(AppListView);
179 }; 181 };
180 182
181 } // namespace app_list 183 } // namespace app_list
182 184
183 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 185 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698