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

Side by Side Diff: chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.cc

Issue 1040863002: Revert "Enable chrome.automation.getDesktop on all aura platforms." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/ui/aura/accessibility/ax_root_obj_wrapper.h" 5 #include "chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h"
6 6
7 #include "ash/shell.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "ui/accessibility/ax_node_data.h" 9 #include "ui/accessibility/ax_node_data.h"
9 #include "ui/accessibility/ax_view_state.h" 10 #include "ui/accessibility/ax_view_state.h"
10 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
11 #include "ui/views/accessibility/ax_aura_obj_cache.h" 12 #include "ui/views/accessibility/ax_aura_obj_cache.h"
12 #include "ui/views/accessibility/ax_window_obj_wrapper.h" 13 #include "ui/views/accessibility/ax_window_obj_wrapper.h"
13 14
14 AXRootObjWrapper::AXRootObjWrapper(int32 id) 15 AXRootObjWrapper::AXRootObjWrapper(int32 id)
15 : id_(id), alert_window_(new aura::Window(NULL)) { 16 : id_(id), alert_window_(new aura::Window(NULL)) {
16 } 17 }
(...skipping 20 matching lines...) Expand all
37 GetChildren(&children); 38 GetChildren(&children);
38 return std::find(children.begin(), children.end(), child) != children.end(); 39 return std::find(children.begin(), children.end(), child) != children.end();
39 } 40 }
40 41
41 views::AXAuraObjWrapper* AXRootObjWrapper::GetParent() { 42 views::AXAuraObjWrapper* AXRootObjWrapper::GetParent() {
42 return NULL; 43 return NULL;
43 } 44 }
44 45
45 void AXRootObjWrapper::GetChildren( 46 void AXRootObjWrapper::GetChildren(
46 std::vector<views::AXAuraObjWrapper*>* out_children) { 47 std::vector<views::AXAuraObjWrapper*>* out_children) {
47 views::AXAuraObjCache::GetInstance()->GetTopLevelWindows(out_children); 48 if (!ash::Shell::HasInstance())
49 return;
50
51 // Only on ash is there a notion of a root with children.
52 aura::Window::Windows children =
53 ash::Shell::GetInstance()->GetAllRootWindows();
54 for (size_t i = 0; i < children.size(); ++i) {
55 out_children->push_back(
56 views::AXAuraObjCache::GetInstance()->GetOrCreate(children[i]));
57 }
58
59 out_children->push_back(
60 views::AXAuraObjCache::GetInstance()->GetOrCreate(alert_window_));
48 } 61 }
49 62
50 void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) { 63 void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
51 out_node_data->id = id_; 64 out_node_data->id = id_;
52 out_node_data->role = ui::AX_ROLE_DESKTOP; 65 out_node_data->role = ui::AX_ROLE_DESKTOP;
53 // TODO(dtseng): Apply a richer set of states. 66 // TODO(dtseng): Apply a richer set of states.
54 out_node_data->state = 0; 67 out_node_data->state = 0;
55 } 68 }
56 69
57 int32 AXRootObjWrapper::GetID() { 70 int32 AXRootObjWrapper::GetID() {
58 return id_; 71 return id_;
59 } 72 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h ('k') | chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698