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

Side by Side Diff: ui/views/window/client_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/window/client_view.h ('k') | ui/views/window/dialog_delegate.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/window/client_view.h" 5 #include "ui/views/window/client_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/accessibility/ax_view_state.h" 8 #include "ui/accessibility/ax_node_data.h"
9 #include "ui/base/hit_test.h" 9 #include "ui/base/hit_test.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 namespace views { 13 namespace views {
14 14
15 // static 15 // static
16 const char ClientView::kViewClassName[] = 16 const char ClientView::kViewClassName[] =
17 "ui/views/window/ClientView"; 17 "ui/views/window/ClientView";
18 18
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // |contents_view_| is allowed to be NULL up until the point where this view 67 // |contents_view_| is allowed to be NULL up until the point where this view
68 // is attached to a Container. 68 // is attached to a Container.
69 if (contents_view_) 69 if (contents_view_)
70 contents_view_->SetBounds(0, 0, width(), height()); 70 contents_view_->SetBounds(0, 0, width(), height());
71 } 71 }
72 72
73 const char* ClientView::GetClassName() const { 73 const char* ClientView::GetClassName() const {
74 return kViewClassName; 74 return kViewClassName;
75 } 75 }
76 76
77 void ClientView::GetAccessibleState(ui::AXViewState* state) { 77 void ClientView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
78 state->role = ui::AX_ROLE_CLIENT; 78 node_data->role = ui::AX_ROLE_CLIENT;
79 } 79 }
80 80
81 void ClientView::OnBoundsChanged(const gfx::Rect& previous_bounds) { 81 void ClientView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
82 // Overridden to do nothing. The NonClientView manually calls Layout on the 82 // Overridden to do nothing. The NonClientView manually calls Layout on the
83 // ClientView when it is itself laid out, see comment in 83 // ClientView when it is itself laid out, see comment in
84 // NonClientView::Layout. 84 // NonClientView::Layout.
85 } 85 }
86 86
87 void ClientView::ViewHierarchyChanged( 87 void ClientView::ViewHierarchyChanged(
88 const ViewHierarchyChangedDetails& details) { 88 const ViewHierarchyChangedDetails& details) {
89 if (details.is_add && details.child == this) { 89 if (details.is_add && details.child == this) {
90 DCHECK(GetWidget()); 90 DCHECK(GetWidget());
91 DCHECK(contents_view_); // |contents_view_| must be valid now! 91 DCHECK(contents_view_); // |contents_view_| must be valid now!
92 // Insert |contents_view_| at index 0 so it is first in the focus chain. 92 // Insert |contents_view_| at index 0 so it is first in the focus chain.
93 // (the OK/Cancel buttons are inserted before contents_view_) 93 // (the OK/Cancel buttons are inserted before contents_view_)
94 AddChildViewAt(contents_view_, 0); 94 AddChildViewAt(contents_view_, 0);
95 } else if (!details.is_add && details.child == contents_view_) { 95 } else if (!details.is_add && details.child == contents_view_) {
96 contents_view_ = nullptr; 96 contents_view_ = nullptr;
97 } 97 }
98 } 98 }
99 99
100 } // namespace views 100 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/window/client_view.h ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698