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

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

Issue 986513002: Revert of Correctly handle tab navigation in the app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_sorting_order
Patch Set: Created 5 years, 9 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
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 // Overridden from SpeechUIModelObserver: 167 // Overridden from SpeechUIModelObserver:
168 void OnSpeechRecognitionStateChanged( 168 void OnSpeechRecognitionStateChanged(
169 SpeechRecognitionState new_state) override; 169 SpeechRecognitionState new_state) override;
170 170
171 AppListViewDelegate* delegate_; // Weak. Owned by AppListService. 171 AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
172 172
173 AppListMainView* app_list_main_view_; 173 AppListMainView* app_list_main_view_;
174 SpeechView* speech_view_; 174 SpeechView* speech_view_;
175 175
176 views::View* search_box_focus_host_; // Owned by the views hierarchy.
177 views::Widget* search_box_widget_; // Owned by the app list's widget. 176 views::Widget* search_box_widget_; // Owned by the app list's widget.
178 SearchBoxView* search_box_view_; // Owned by |search_box_widget_|. 177 SearchBoxView* search_box_view_; // Owned by |search_box_widget_|.
179 178
180 // A semi-transparent white overlay that covers the app list while dialogs are 179 // A semi-transparent white overlay that covers the app list while dialogs are
181 // open. 180 // open.
182 views::View* overlay_view_; 181 views::View* overlay_view_;
183 182
184 ObserverList<AppListViewObserver> observers_; 183 ObserverList<AppListViewObserver> observers_;
185 scoped_ptr<HideViewAnimationObserver> animation_observer_; 184 scoped_ptr<HideViewAnimationObserver> animation_observer_;
186 185
187 // For UMA and testing. If non-null, triggered when the app list is painted. 186 // For UMA and testing. If non-null, triggered when the app list is painted.
188 base::Closure next_paint_callback_; 187 base::Closure next_paint_callback_;
189 188
190 DISALLOW_COPY_AND_ASSIGN(AppListView); 189 DISALLOW_COPY_AND_ASSIGN(AppListView);
191 }; 190 };
192 191
193 } // namespace app_list 192 } // namespace app_list
194 193
195 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 194 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/platform_apps/custom_launcher_page/main.js ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698