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

Unified Diff: chrome/browser/ui/aura/accessibility/ax_tree_source_aura.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc
diff --git a/chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc b/chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc
deleted file mode 100644
index 29912c787a573361e7580e599a492ff5ec92c08b..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/aura/accessibility/ax_tree_source_aura.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
-
-#include <vector>
-
-#include "chrome/browser/accessibility/ax_tree_id_registry.h"
-#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents.h"
-#include "ui/views/accessibility/ax_aura_obj_cache.h"
-#include "ui/views/accessibility/ax_aura_obj_wrapper.h"
-#include "ui/views/accessibility/ax_view_obj_wrapper.h"
-#include "ui/views/controls/webview/webview.h"
-
-using views::AXAuraObjCache;
-using views::AXAuraObjWrapper;
-
-AXTreeSourceAura::AXTreeSourceAura() {
- root_.reset(new AXRootObjWrapper(AXAuraObjCache::GetInstance()->GetNextID()));
-}
-
-AXTreeSourceAura::~AXTreeSourceAura() {
- root_.reset();
-}
-
-void AXTreeSourceAura::DoDefault(int32 id) {
- AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
- CHECK(obj);
- obj->DoDefault();
-}
-
-void AXTreeSourceAura::Focus(int32 id) {
- AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
- CHECK(obj);
- obj->Focus();
-}
-
-void AXTreeSourceAura::MakeVisible(int32 id) {
- AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
- CHECK(obj);
- obj->MakeVisible();
-}
-
-void AXTreeSourceAura::SetSelection(int32 id, int32 start, int32 end) {
- AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
- CHECK(obj);
- obj->SetSelection(start, end);
-}
-
-AXAuraObjWrapper* AXTreeSourceAura::GetRoot() const {
- return root_.get();
-}
-
-AXAuraObjWrapper* AXTreeSourceAura::GetFromId(int32 id) const {
- if (id == root_->GetID())
- return root_.get();
- return AXAuraObjCache::GetInstance()->Get(id);
-}
-
-int32 AXTreeSourceAura::GetId(AXAuraObjWrapper* node) const {
- return node->GetID();
-}
-
-void AXTreeSourceAura::GetChildren(
- AXAuraObjWrapper* node,
- std::vector<AXAuraObjWrapper*>* out_children) const {
- node->GetChildren(out_children);
-}
-
-AXAuraObjWrapper* AXTreeSourceAura::GetParent(AXAuraObjWrapper* node) const {
- AXAuraObjWrapper* parent = node->GetParent();
- if (!parent && node->GetID() != root_->GetID())
- parent = root_.get();
- return parent;
-}
-
-bool AXTreeSourceAura::IsValid(AXAuraObjWrapper* node) const {
- return node && node->GetID() != -1;
-}
-
-bool AXTreeSourceAura::IsEqual(AXAuraObjWrapper* node1,
- AXAuraObjWrapper* node2) const {
- if (!node1 || !node2)
- return false;
-
- return node1->GetID() == node2->GetID() && node1->GetID() != -1;
-}
-
-AXAuraObjWrapper* AXTreeSourceAura::GetNull() const {
- return NULL;
-}
-
-void AXTreeSourceAura::SerializeNode(AXAuraObjWrapper* node,
- ui::AXNodeData* out_data) const {
- node->Serialize(out_data);
-
- if (out_data->role == ui::AX_ROLE_WEB_VIEW) {
- views::View* view = static_cast<views::AXViewObjWrapper*>(node)->view();
- content::WebContents* contents =
- static_cast<views::WebView*>(view)->GetWebContents();
- content::RenderFrameHost* rfh = contents->GetMainFrame();
- if (rfh) {
- int process_id = rfh->GetProcess()->GetID();
- int routing_id = rfh->GetRoutingID();
- int ax_tree_id = AXTreeIDRegistry::GetInstance()->GetOrCreateAXTreeID(
- process_id, routing_id);
- out_data->AddIntAttribute(ui::AX_ATTR_CHILD_TREE_ID, ax_tree_id);
- }
- }
-}
-
-std::string AXTreeSourceAura::ToString(AXAuraObjWrapper* root,
- std::string prefix) {
- ui::AXNodeData data;
- root->Serialize(&data);
- std::string output = prefix + data.ToString() + '\n';
-
- std::vector<AXAuraObjWrapper*> children;
- root->GetChildren(&children);
-
- prefix += prefix[0];
- for (size_t i = 0; i < children.size(); ++i)
- output += ToString(children[i], prefix);
-
- return output;
-}
« no previous file with comments | « chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698