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

Side by Side Diff: ui/app_list/views/tile_item_view.cc

Issue 935143005: TileItemView: Fixed ChromeVox selection upon deselection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@glevin-ares-tabstops
Patch Set: Created 5 years, 10 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 | « 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/tile_item_view.h" 5 #include "ui/app_list/views/tile_item_view.h"
6 6
7 #include "ui/app_list/app_list_constants.h" 7 #include "ui/app_list/app_list_constants.h"
8 #include "ui/app_list/views/app_list_main_view.h" 8 #include "ui/app_list/views/app_list_main_view.h"
9 #include "ui/views/background.h" 9 #include "ui/views/background.h"
10 #include "ui/views/controls/image_view.h" 10 #include "ui/views/controls/image_view.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 TileItemView::~TileItemView() { 50 TileItemView::~TileItemView() {
51 } 51 }
52 52
53 void TileItemView::SetSelected(bool selected) { 53 void TileItemView::SetSelected(bool selected) {
54 if (selected == selected_) 54 if (selected == selected_)
55 return; 55 return;
56 56
57 selected_ = selected; 57 selected_ = selected;
58 UpdateBackgroundColor(); 58 UpdateBackgroundColor();
59 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true); 59
60 if (selected)
61 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
60 } 62 }
61 63
62 void TileItemView::SetParentBackgroundColor(SkColor color) { 64 void TileItemView::SetParentBackgroundColor(SkColor color) {
63 parent_background_color_ = color; 65 parent_background_color_ = color;
64 UpdateBackgroundColor(); 66 UpdateBackgroundColor();
65 } 67 }
66 68
67 void TileItemView::SetIcon(const gfx::ImageSkia& icon) { 69 void TileItemView::SetIcon(const gfx::ImageSkia& icon) {
68 icon_->SetImage(icon); 70 icon_->SetImage(icon);
69 } 71 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // truncation in making the tooltip. We do not want the label itself to have a 110 // truncation in making the tooltip. We do not want the label itself to have a
109 // tooltip, so we only temporarily enable it to get the tooltip text from the 111 // tooltip, so we only temporarily enable it to get the tooltip text from the
110 // label, then disable it again. 112 // label, then disable it again.
111 title_->SetHandlesTooltips(true); 113 title_->SetHandlesTooltips(true);
112 bool handled = title_->GetTooltipText(p, tooltip); 114 bool handled = title_->GetTooltipText(p, tooltip);
113 title_->SetHandlesTooltips(false); 115 title_->SetHandlesTooltips(false);
114 return handled; 116 return handled;
115 } 117 }
116 118
117 } // namespace app_list 119 } // 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