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

Side by Side Diff: ui/views/widget/root_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
« no previous file with comments | « ui/views/widget/root_view.h ('k') | ui/views/window/client_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/views/widget/root_view.h" 5 #include "ui/views/widget/root_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "ui/accessibility/ax_view_state.h" 12 #include "ui/accessibility/ax_node_data.h"
13 #include "ui/base/cursor/cursor.h" 13 #include "ui/base/cursor/cursor.h"
14 #include "ui/base/dragdrop/drag_drop_types.h" 14 #include "ui/base/dragdrop/drag_drop_types.h"
15 #include "ui/base/ui_base_switches_util.h" 15 #include "ui/base/ui_base_switches_util.h"
16 #include "ui/compositor/layer.h" 16 #include "ui/compositor/layer.h"
17 #include "ui/events/event.h" 17 #include "ui/events/event.h"
18 #include "ui/events/event_utils.h" 18 #include "ui/events/event_utils.h"
19 #include "ui/events/keycodes/keyboard_codes.h" 19 #include "ui/events/keycodes/keyboard_codes.h"
20 #include "ui/gfx/canvas.h" 20 #include "ui/gfx/canvas.h"
21 #include "ui/views/drag_controller.h" 21 #include "ui/views/drag_controller.h"
22 #include "ui/views/focus/view_storage.h" 22 #include "ui/views/focus/view_storage.h"
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 } 593 }
594 594
595 void RootView::SetMouseHandler(View* new_mh) { 595 void RootView::SetMouseHandler(View* new_mh) {
596 // If we're clearing the mouse handler, clear explicit_mouse_handler_ as well. 596 // If we're clearing the mouse handler, clear explicit_mouse_handler_ as well.
597 explicit_mouse_handler_ = (new_mh != NULL); 597 explicit_mouse_handler_ = (new_mh != NULL);
598 mouse_pressed_handler_ = new_mh; 598 mouse_pressed_handler_ = new_mh;
599 gesture_handler_ = new_mh; 599 gesture_handler_ = new_mh;
600 drag_info_.Reset(); 600 drag_info_.Reset();
601 } 601 }
602 602
603 void RootView::GetAccessibleState(ui::AXViewState* state) { 603 void RootView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
604 state->name = widget_->widget_delegate()->GetAccessibleWindowTitle(); 604 node_data->SetName(widget_->widget_delegate()->GetAccessibleWindowTitle());
605 state->role = widget_->widget_delegate()->GetAccessibleWindowRole(); 605 node_data->role = widget_->widget_delegate()->GetAccessibleWindowRole();
606 } 606 }
607 607
608 void RootView::UpdateParentLayer() { 608 void RootView::UpdateParentLayer() {
609 if (layer()) 609 if (layer())
610 ReparentLayer(gfx::Vector2d(GetMirroredX(), y()), widget_->GetLayer()); 610 ReparentLayer(gfx::Vector2d(GetMirroredX(), y()), widget_->GetLayer());
611 } 611 }
612 612
613 //////////////////////////////////////////////////////////////////////////////// 613 ////////////////////////////////////////////////////////////////////////////////
614 // RootView, protected: 614 // RootView, protected:
615 615
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 757
758 #ifndef NDEBUG 758 #ifndef NDEBUG
759 DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_)); 759 DCHECK(!event_dispatch_target_ || Contains(event_dispatch_target_));
760 #endif 760 #endif
761 761
762 return details; 762 return details;
763 } 763 }
764 764
765 } // namespace internal 765 } // namespace internal
766 } // namespace views 766 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/root_view.h ('k') | ui/views/window/client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698