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

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

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/contents_view.h ('k') | ui/app_list/search_box_view.h » ('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 #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_view.h" 9 #include "ui/app_list/app_list_view.h"
10 #include "ui/app_list/apps_grid_view.h" 10 #include "ui/app_list/apps_grid_view.h"
11 #include "ui/app_list/page_switcher.h" 11 #include "ui/app_list/page_switcher.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/event.h"
14 #include "ui/views/animation/bounds_animator.h" 15 #include "ui/views/animation/bounds_animator.h"
15 #include "ui/views/view_model.h" 16 #include "ui/views/view_model.h"
16 #include "ui/views/view_model_utils.h" 17 #include "ui/views/view_model_utils.h"
17 18
18 namespace app_list { 19 namespace app_list {
19 20
20 namespace { 21 namespace {
21 22
22 const int kPreferredIconDimension = 48; 23 const int kPreferredIconDimension = 48;
23 const int kPreferredCols = 4; 24 const int kPreferredCols = 4;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 213 }
213 break; 214 break;
214 } 215 }
215 default: 216 default:
216 break; 217 break;
217 } 218 }
218 219
219 return ui::GESTURE_STATUS_UNKNOWN; 220 return ui::GESTURE_STATUS_UNKNOWN;
220 } 221 }
221 222
222 bool ContentsView::OnKeyPressed(const views::KeyEvent& event) { 223 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
223 switch (show_state_) { 224 switch (show_state_) {
224 case SHOW_APPS: 225 case SHOW_APPS:
225 return GetAppsGridView(view_model_.get())->OnKeyPressed(event); 226 return GetAppsGridView(view_model_.get())->OnKeyPressed(event);
226 case SHOW_SEARCH_RESULTS: 227 case SHOW_SEARCH_RESULTS:
227 return GetSearchResultListView(view_model_.get())->OnKeyPressed(event); 228 return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
228 default: 229 default:
229 NOTREACHED() << "Unknown show state " << show_state_; 230 NOTREACHED() << "Unknown show state " << show_state_;
230 } 231 }
231 return false; 232 return false;
232 } 233 }
(...skipping 20 matching lines...) Expand all
253 pagination_model_->SelectPageRelative(event.x_offset() > 0 ? 1 : -1, 254 pagination_model_->SelectPageRelative(event.x_offset() > 0 ? 1 : -1,
254 true); 255 true);
255 } 256 }
256 return true; 257 return true;
257 } 258 }
258 259
259 return false; 260 return false;
260 } 261 }
261 262
262 } // namespace app_list 263 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/contents_view.h ('k') | ui/app_list/search_box_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698