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

Side by Side Diff: ash/system/tray/hover_highlight_view.cc

Issue 196133012: Fix incorrect use of AXState caused when refactoring two enums into one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add dependency Created 6 years, 9 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ash/system/tray/hover_highlight_view.h" 5 #include "ash/system/tray/hover_highlight_view.h"
6 6
7 #include "ash/system/tray/fixed_sized_image_view.h" 7 #include "ash/system/tray/fixed_sized_image_view.h"
8 #include "ash/system/tray/tray_constants.h" 8 #include "ash/system/tray/tray_constants.h"
9 #include "ash/system/tray/view_click_listener.h" 9 #include "ash/system/tray/view_click_listener.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 return false; 135 return false;
136 listener_->OnViewClicked(this); 136 listener_->OnViewClicked(this);
137 return true; 137 return true;
138 } 138 }
139 139
140 void HoverHighlightView::GetAccessibleState(ui::AXViewState* state) { 140 void HoverHighlightView::GetAccessibleState(ui::AXViewState* state) {
141 ActionableView::GetAccessibleState(state); 141 ActionableView::GetAccessibleState(state);
142 142
143 if (checkable_) { 143 if (checkable_) {
144 state->role = ui::AX_ROLE_CHECK_BOX; 144 state->role = ui::AX_ROLE_CHECK_BOX;
145 state->state = checked_ ? ui::AX_STATE_CHECKED : 0; 145 if (checked_)
146 state->SetStateFlag(ui::AX_STATE_CHECKED);
146 } 147 }
147 } 148 }
148 149
149 gfx::Size HoverHighlightView::GetPreferredSize() { 150 gfx::Size HoverHighlightView::GetPreferredSize() {
150 gfx::Size size = ActionableView::GetPreferredSize(); 151 gfx::Size size = ActionableView::GetPreferredSize();
151 if (!expandable_ || size.height() < kTrayPopupItemHeight) 152 if (!expandable_ || size.height() < kTrayPopupItemHeight)
152 size.set_height(kTrayPopupItemHeight); 153 size.set_height(kTrayPopupItemHeight);
153 return size; 154 return size;
154 } 155 }
155 156
(...skipping 24 matching lines...) Expand all
180 canvas->DrawColor(hover_ ? highlight_color_ : default_color_); 181 canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
181 } 182 }
182 183
183 void HoverHighlightView::OnFocus() { 184 void HoverHighlightView::OnFocus() {
184 ScrollRectToVisible(gfx::Rect(gfx::Point(), size())); 185 ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
185 ActionableView::OnFocus(); 186 ActionableView::OnFocus();
186 } 187 }
187 188
188 } // namespace internal 189 } // namespace internal
189 } // namespace ash 190 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698