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

Side by Side Diff: ui/app_list/contents_view.cc

Issue 11418312: app_list: Improve initial icon loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, stop timer when showing widget because no pending icon loads Created 8 years 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/apps_grid_view.cc ('k') | no next file » | 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 #include "ui/app_list/contents_view.h" 5 #include "ui/app_list/contents_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/app_list/app_list_constants.h" 9 #include "ui/app_list/app_list_constants.h"
10 #include "ui/app_list/app_list_view.h" 10 #include "ui/app_list/app_list_view.h"
11 #include "ui/app_list/apps_grid_view.h" 11 #include "ui/app_list/apps_grid_view.h"
12 #include "ui/app_list/pagination_model.h" 12 #include "ui/app_list/pagination_model.h"
13 #include "ui/app_list/search_result_list_view.h" 13 #include "ui/app_list/search_result_list_view.h"
14 #include "ui/base/events/event.h" 14 #include "ui/base/events/event.h"
15 #include "ui/views/animation/bounds_animator.h" 15 #include "ui/views/animation/bounds_animator.h"
16 #include "ui/views/view_model.h" 16 #include "ui/views/view_model.h"
17 #include "ui/views/view_model_utils.h" 17 #include "ui/views/view_model_utils.h"
18 18
19 namespace app_list { 19 namespace app_list {
20 20
21 namespace { 21 namespace {
22 22
23 const int kPreferredIconDimension = 48; 23 const int kPreferredIconDimension = 48;
24 const int kPreferredCols = 4;
25 const int kPreferredRows = 4;
26 24
27 // Indexes of interesting views in ViewModel of ContentsView. 25 // Indexes of interesting views in ViewModel of ContentsView.
28 const int kIndexAppsGrid = 0; 26 const int kIndexAppsGrid = 0;
29 const int kIndexSearchResults = 1; 27 const int kIndexSearchResults = 1;
30 28
31 const int kMinMouseWheelToSwitchPage = 20; 29 const int kMinMouseWheelToSwitchPage = 20;
32 const int kMinScrollToSwitchPage = 20; 30 const int kMinScrollToSwitchPage = 20;
33 const int kMinHorizVelocityToSwitchPage = 800; 31 const int kMinHorizVelocityToSwitchPage = 800;
34 32
35 const double kFinishTransitionThreshold = 0.33; 33 const double kFinishTransitionThreshold = 0.33;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 227 }
230 228
231 if (!pagination_model_->has_transition()) { 229 if (!pagination_model_->has_transition()) {
232 pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1, 230 pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1,
233 true); 231 true);
234 } 232 }
235 return ui::ER_HANDLED; 233 return ui::ER_HANDLED;
236 } 234 }
237 235
238 } // namespace app_list 236 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/apps_grid_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698