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

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

Issue 10907165: Merge 155395 - app_list: Fix accessibility regression in apps grid. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/
Patch Set: Created 8 years, 3 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 | « no previous file | 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/apps_grid_view.h" 5 #include "ui/app_list/apps_grid_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/app_list/app_list_item_view.h" 9 #include "ui/app_list/app_list_item_view.h"
10 #include "ui/app_list/pagination_model.h" 10 #include "ui/app_list/pagination_model.h"
11 #include "ui/views/border.h" 11 #include "ui/views/border.h"
12 #include "ui/views/widget/widget.h"
12 13
13 namespace { 14 namespace {
14 15
15 // Padding space in pixels for fixed layout. 16 // Padding space in pixels for fixed layout.
16 const int kLeftRightPadding = 20; 17 const int kLeftRightPadding = 20;
17 const int kTopPadding = 1; 18 const int kTopPadding = 1;
18 19
19 // Padding space in pixels between pages. 20 // Padding space in pixels between pages.
20 const int kPagePadding = 40; 21 const int kPagePadding = 40;
21 22
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 if (selected_item_index_ == index) 279 if (selected_item_index_ == index)
279 return; 280 return;
280 281
281 if (selected_item_index_ >= 0) 282 if (selected_item_index_ >= 0)
282 GetItemViewAtIndex(selected_item_index_)->SchedulePaint(); 283 GetItemViewAtIndex(selected_item_index_)->SchedulePaint();
283 284
284 if (index < 0 || index >= child_count()) { 285 if (index < 0 || index >= child_count()) {
285 selected_item_index_ = -1; 286 selected_item_index_ = -1;
286 } else { 287 } else {
287 selected_item_index_ = index; 288 selected_item_index_ = index;
288 GetItemViewAtIndex(selected_item_index_)->SchedulePaint(); 289 AppListItemView* selected_view = GetItemViewAtIndex(selected_item_index_);
290 selected_view->SchedulePaint();
291 GetWidget()->NotifyAccessibilityEvent(
292 selected_view, ui::AccessibilityTypes::EVENT_FOCUS, true);
289 293
290 if (tiles_per_page()) { 294 if (tiles_per_page()) {
291 pagination_model_->SelectPage(selected_item_index_ / tiles_per_page(), 295 pagination_model_->SelectPage(selected_item_index_ / tiles_per_page(),
292 true /* animate */); 296 true /* animate */);
293 } 297 }
294 } 298 }
295 } 299 }
296 300
297 void AppsGridView::ListItemsAdded(size_t start, size_t count) { 301 void AppsGridView::ListItemsAdded(size_t start, size_t count) {
298 for (size_t i = start; i < start + count; ++i) 302 for (size_t i = start; i < start + count; ++i)
(...skipping 24 matching lines...) Expand all
323 327
324 void AppsGridView::SelectedPageChanged(int old_selected, int new_selected) { 328 void AppsGridView::SelectedPageChanged(int old_selected, int new_selected) {
325 Layout(); 329 Layout();
326 } 330 }
327 331
328 void AppsGridView::TransitionChanged() { 332 void AppsGridView::TransitionChanged() {
329 Layout(); 333 Layout();
330 } 334 }
331 335
332 } // namespace app_list 336 } // namespace app_list
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698