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

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

Issue 2982453002: New AppListView Scroll Behavior. (Closed)
Patch Set: Removed unintended edit. Created 3 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
« no previous file with comments | « ui/app_list/views/app_list_page.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 <memory> 8 #include <memory>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 bool is_fullscreen() const { 129 bool is_fullscreen() const {
130 return app_list_state_ == FULLSCREEN_ALL_APPS || 130 return app_list_state_ == FULLSCREEN_ALL_APPS ||
131 app_list_state_ == FULLSCREEN_SEARCH; 131 app_list_state_ == FULLSCREEN_SEARCH;
132 } 132 }
133 133
134 AppListState app_list_state() const { return app_list_state_; } 134 AppListState app_list_state() const { return app_list_state_; }
135 135
136 // Called when maximize mode starts and ends. 136 // Called when maximize mode starts and ends.
137 void OnMaximizeModeChanged(bool started); 137 void OnMaximizeModeChanged(bool started);
138 138
139 // Changes |app_list_state_| from |PEEKING| to |FULLSCREEN_ALL_APPS|.
140 bool HandleScroll(const ui::Event* event);
141
139 private: 142 private:
140 friend class test::AppListViewTestApi; 143 friend class test::AppListViewTestApi;
141 144
142 void InitContents(gfx::NativeView parent, int initial_apps_page); 145 void InitContents(gfx::NativeView parent, int initial_apps_page);
143 146
144 void InitChildWidgets(); 147 void InitChildWidgets();
145 148
146 // Initializes the widget for fullscreen mode. 149 // Initializes the widget for fullscreen mode.
147 void InitializeFullscreen(gfx::NativeView parent, int initial_apps_page); 150 void InitializeFullscreen(gfx::NativeView parent, int initial_apps_page);
148 151
(...skipping 19 matching lines...) Expand all
168 void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, 171 void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
169 views::Widget* widget) const override; 172 views::Widget* widget) const override;
170 int GetDialogButtons() const override; 173 int GetDialogButtons() const override;
171 174
172 // Overridden from views::WidgetDelegateView: 175 // Overridden from views::WidgetDelegateView:
173 views::View* GetInitiallyFocusedView() override; 176 views::View* GetInitiallyFocusedView() override;
174 bool WidgetHasHitTestMask() const override; 177 bool WidgetHasHitTestMask() const override;
175 void GetWidgetHitTestMask(gfx::Path* mask) const override; 178 void GetWidgetHitTestMask(gfx::Path* mask) const override;
176 179
177 // Overridden from ui::EventHandler: 180 // Overridden from ui::EventHandler:
181 void OnScrollEvent(ui::ScrollEvent* event) override;
178 void OnMouseEvent(ui::MouseEvent* event) override; 182 void OnMouseEvent(ui::MouseEvent* event) override;
179 void OnGestureEvent(ui::GestureEvent* event) override; 183 void OnGestureEvent(ui::GestureEvent* event) override;
180 184
181 // Overridden from views::WidgetObserver: 185 // Overridden from views::WidgetObserver:
182 void OnWidgetDestroying(views::Widget* widget) override; 186 void OnWidgetDestroying(views::Widget* widget) override;
183 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override; 187 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
184 188
185 // Overridden from SpeechUIModelObserver: 189 // Overridden from SpeechUIModelObserver:
186 void OnSpeechRecognitionStateChanged( 190 void OnSpeechRecognitionStateChanged(
187 SpeechRecognitionState new_state) override; 191 SpeechRecognitionState new_state) override;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 233
230 // For UMA and testing. If non-null, triggered when the app list is painted. 234 // For UMA and testing. If non-null, triggered when the app list is painted.
231 base::Closure next_paint_callback_; 235 base::Closure next_paint_callback_;
232 236
233 DISALLOW_COPY_AND_ASSIGN(AppListView); 237 DISALLOW_COPY_AND_ASSIGN(AppListView);
234 }; 238 };
235 239
236 } // namespace app_list 240 } // namespace app_list
237 241
238 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 242 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_page.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