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

Side by Side Diff: content/browser/accessibility/browser_accessibility_manager.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Addressing remaining feedback, cleaning up build files. Created 5 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
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 "content/browser/accessibility/browser_accessibility_manager.h" 5 #include "content/browser/accessibility/browser_accessibility_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/accessibility/browser_accessibility.h" 8 #include "content/browser/accessibility/browser_accessibility.h"
9 #include "content/common/accessibility_messages.h" 9 #include "content/common/accessibility_messages.h"
10 #include "ui/accessibility/ax_tree_serializer.h" 10 #include "ui/accessibility/ax_tree_serializer.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 if (node7.id != no_id) 68 if (node7.id != no_id)
69 update.nodes.push_back(node7); 69 update.nodes.push_back(node7);
70 if (node8.id != no_id) 70 if (node8.id != no_id)
71 update.nodes.push_back(node8); 71 update.nodes.push_back(node8);
72 if (node9.id != no_id) 72 if (node9.id != no_id)
73 update.nodes.push_back(node9); 73 update.nodes.push_back(node9);
74 return update; 74 return update;
75 } 75 }
76 76
77 BrowserAccessibility* BrowserAccessibilityFactory::Create() { 77 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
78 // TODO(mfomitchev): Accessibility on Android Aura - crbug.com/543262.
79 #if defined(OS_ANDROID) && defined(USE_AURA)
80 return nullptr;
81 #else
78 return BrowserAccessibility::Create(); 82 return BrowserAccessibility::Create();
83 #endif
79 } 84 }
80 85
81 BrowserAccessibilityFindInPageInfo::BrowserAccessibilityFindInPageInfo() 86 BrowserAccessibilityFindInPageInfo::BrowserAccessibilityFindInPageInfo()
82 : request_id(-1), 87 : request_id(-1),
83 match_index(-1), 88 match_index(-1),
84 start_id(-1), 89 start_id(-1),
85 start_offset(0), 90 start_offset(0),
86 end_id(-1), 91 end_id(-1),
87 end_offset(-1), 92 end_offset(-1),
88 active_request_id(-1) {} 93 active_request_id(-1) {}
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 tree_->CreateTreeSource()); 608 tree_->CreateTreeSource());
604 ui::AXTreeSerializer<const ui::AXNode*, 609 ui::AXTreeSerializer<const ui::AXNode*,
605 ui::AXNodeData, 610 ui::AXNodeData,
606 ui::AXTreeData> serializer(tree_source.get()); 611 ui::AXTreeData> serializer(tree_source.get());
607 ui::AXTreeUpdate update; 612 ui::AXTreeUpdate update;
608 serializer.SerializeChanges(tree_->root(), &update); 613 serializer.SerializeChanges(tree_->root(), &update);
609 return update; 614 return update;
610 } 615 }
611 616
612 } // namespace content 617 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698