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

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

Issue 390273002: Experimental app list banner now appears on top of launcher pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Avoid making two calls to set position. Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/app_list/views/app_list_background.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"
11 #include "ui/app_list/app_list_export.h" 11 #include "ui/app_list/app_list_export.h"
12 #include "ui/app_list/app_list_view_delegate_observer.h" 12 #include "ui/app_list/app_list_view_delegate_observer.h"
13 #include "ui/app_list/speech_ui_model_observer.h" 13 #include "ui/app_list/speech_ui_model_observer.h"
14 #include "ui/views/bubble/bubble_delegate.h" 14 #include "ui/views/bubble/bubble_delegate.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace base { 17 namespace base {
18 class FilePath; 18 class FilePath;
19 } 19 }
20 20
21 namespace test { 21 namespace test {
22 class AppListViewTestApi; 22 class AppListViewTestApi;
23 } 23 }
24 24
25 namespace views {
26 class ImageView;
27 }
28
25 namespace app_list { 29 namespace app_list {
26 class ApplicationDragAndDropHost; 30 class ApplicationDragAndDropHost;
27 class AppListMainView; 31 class AppListMainView;
28 class AppListModel; 32 class AppListModel;
29 class AppListViewDelegate; 33 class AppListViewDelegate;
30 class AppListViewObserver; 34 class AppListViewObserver;
31 class HideViewAnimationObserver; 35 class HideViewAnimationObserver;
32 class PaginationModel; 36 class PaginationModel;
33 class SpeechView; 37 class SpeechView;
34 38
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 154
151 // Overridden from SpeechUIModelObserver: 155 // Overridden from SpeechUIModelObserver:
152 virtual void OnSpeechRecognitionStateChanged( 156 virtual void OnSpeechRecognitionStateChanged(
153 SpeechRecognitionState new_state) OVERRIDE; 157 SpeechRecognitionState new_state) OVERRIDE;
154 158
155 scoped_ptr<AppListViewDelegate> delegate_; 159 scoped_ptr<AppListViewDelegate> delegate_;
156 160
157 AppListMainView* app_list_main_view_; 161 AppListMainView* app_list_main_view_;
158 SpeechView* speech_view_; 162 SpeechView* speech_view_;
159 163
164 // The red "experimental" banner for the experimental app list.
165 views::ImageView* experimental_banner_view_;
166
160 // A semi-transparent white overlay that covers the app list while dialogs are 167 // A semi-transparent white overlay that covers the app list while dialogs are
161 // open. 168 // open.
162 views::View* overlay_view_; 169 views::View* overlay_view_;
163 170
164 ObserverList<AppListViewObserver> observers_; 171 ObserverList<AppListViewObserver> observers_;
165 scoped_ptr<HideViewAnimationObserver> animation_observer_; 172 scoped_ptr<HideViewAnimationObserver> animation_observer_;
166 173
167 // For UMA and testing. If non-null, triggered when the app list is painted. 174 // For UMA and testing. If non-null, triggered when the app list is painted.
168 base::Closure next_paint_callback_; 175 base::Closure next_paint_callback_;
169 176
170 DISALLOW_COPY_AND_ASSIGN(AppListView); 177 DISALLOW_COPY_AND_ASSIGN(AppListView);
171 }; 178 };
172 179
173 } // namespace app_list 180 } // namespace app_list
174 181
175 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 182 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_background.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