Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / views / accessible_pane_view.cc

diff --git a/src/ui/views/accessible_pane_view.cc b/src/ui/views/accessible_pane_view.cc
index 35ca7bf..84fccdc 100644 (file)
--- a/src/ui/views/accessible_pane_view.cc
+++ b/src/ui/views/accessible_pane_view.cc
@@ -5,7 +5,7 @@
 #include "ui/views/accessible_pane_view.h"
 
 #include "base/message_loop/message_loop.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
@@ -43,13 +43,13 @@ class AccessiblePaneViewFocusSearch : public FocusSearch {
 AccessiblePaneView::AccessiblePaneView()
     : pane_has_focus_(false),
       allow_deactivate_on_esc_(false),
-      method_factory_(this),
       focus_manager_(NULL),
       home_key_(ui::VKEY_HOME, ui::EF_NONE),
       end_key_(ui::VKEY_END, ui::EF_NONE),
       escape_key_(ui::VKEY_ESCAPE, ui::EF_NONE),
       left_key_(ui::VKEY_LEFT, ui::EF_NONE),
-      right_key_(ui::VKEY_RIGHT, ui::EF_NONE) {
+      right_key_(ui::VKEY_RIGHT, ui::EF_NONE),
+      method_factory_(this) {
   focus_search_.reset(new AccessiblePaneViewFocusSearch(this));
   last_focused_view_storage_id_ = ViewStorage::GetInstance()->CreateStorageID();
 }
@@ -207,8 +207,8 @@ void AccessiblePaneView::SetVisible(bool flag) {
   View::SetVisible(flag);
 }
 
-void AccessiblePaneView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PANE;
+void AccessiblePaneView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_PANE;
 }
 
 void AccessiblePaneView::RequestFocus() {