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

Side by Side Diff: ui/message_center/views/message_view.cc

Issue 2477463003: Replace ui::AXViewState with AXNodeData and AXActionData (Closed)
Patch Set: Fix test Created 4 years, 1 month 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
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/message_center/views/message_view.h" 5 #include "ui/message_center/views/message_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/accessibility/ax_view_state.h" 8 #include "ui/accessibility/ax_node_data.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/models/simple_menu_model.h" 10 #include "ui/base/models/simple_menu_model.h"
11 #include "ui/compositor/scoped_layer_animation_settings.h" 11 #include "ui/compositor/scoped_layer_animation_settings.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/shadow_value.h" 13 #include "ui/gfx/shadow_value.h"
14 #include "ui/message_center/message_center.h" 14 #include "ui/message_center/message_center.h"
15 #include "ui/message_center/message_center_style.h" 15 #include "ui/message_center/message_center_style.h"
16 #include "ui/message_center/views/message_center_controller.h" 16 #include "ui/message_center/views/message_center_controller.h"
17 #include "ui/message_center/views/padded_button.h" 17 #include "ui/message_center/views/padded_button.h"
18 #include "ui/resources/grit/ui_resources.h" 18 #include "ui/resources/grit/ui_resources.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 void MessageView::RequestFocusOnCloseButton() { 122 void MessageView::RequestFocusOnCloseButton() {
123 if (close_button_) 123 if (close_button_)
124 close_button_->RequestFocus(); 124 close_button_->RequestFocus();
125 } 125 }
126 126
127 bool MessageView::IsPinned() { 127 bool MessageView::IsPinned() {
128 return !close_button_; 128 return !close_button_;
129 } 129 }
130 130
131 void MessageView::GetAccessibleState(ui::AXViewState* state) { 131 void MessageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
132 state->role = ui::AX_ROLE_BUTTON; 132 node_data->role = ui::AX_ROLE_BUTTON;
133 state->name = accessible_name_; 133 node_data->SetName(accessible_name_);
134 } 134 }
135 135
136 bool MessageView::OnMousePressed(const ui::MouseEvent& event) { 136 bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
137 if (!event.IsOnlyLeftMouseButton()) 137 if (!event.IsOnlyLeftMouseButton())
138 return false; 138 return false;
139 139
140 controller_->ClickOnNotification(notification_id_); 140 controller_->ClickOnNotification(notification_id_);
141 return true; 141 return true;
142 } 142 }
143 143
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME)); 279 IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME));
280 close->set_owned_by_client(); 280 close->set_owned_by_client();
281 AddChildView(close); 281 AddChildView(close);
282 close_button_.reset(close); 282 close_button_.reset(close);
283 } else if (notification.pinned() && close_button_) { 283 } else if (notification.pinned() && close_button_) {
284 close_button_.reset(); 284 close_button_.reset();
285 } 285 }
286 } 286 }
287 287
288 } // namespace message_center 288 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/message_view.h ('k') | ui/message_center/views/notifier_settings_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698