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

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

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 10 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/android/browser_jni_registrar.cc » ('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 "content/browser/accessibility/browser_accessibility_manager.h" 5 #include "content/browser/accessibility/browser_accessibility_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (node10.id != no_id) 80 if (node10.id != no_id)
81 update.nodes.push_back(node10); 81 update.nodes.push_back(node10);
82 if (node11.id != no_id) 82 if (node11.id != no_id)
83 update.nodes.push_back(node11); 83 update.nodes.push_back(node11);
84 if (node12.id != no_id) 84 if (node12.id != no_id)
85 update.nodes.push_back(node12); 85 update.nodes.push_back(node12);
86 return update; 86 return update;
87 } 87 }
88 88
89 BrowserAccessibility* BrowserAccessibilityFactory::Create() { 89 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
90 #if defined(OS_ANDROID) && defined(USE_AURA)
91 return nullptr;
92 #else
93 return BrowserAccessibility::Create(); 90 return BrowserAccessibility::Create();
94 #endif
95 } 91 }
96 92
97 BrowserAccessibilityFindInPageInfo::BrowserAccessibilityFindInPageInfo() 93 BrowserAccessibilityFindInPageInfo::BrowserAccessibilityFindInPageInfo()
98 : request_id(-1), 94 : request_id(-1),
99 match_index(-1), 95 match_index(-1),
100 start_id(-1), 96 start_id(-1),
101 start_offset(0), 97 start_offset(0),
102 end_id(-1), 98 end_id(-1),
103 end_offset(-1), 99 end_offset(-1),
104 active_request_id(-1) {} 100 active_request_id(-1) {}
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 tree_->CreateTreeSource()); 637 tree_->CreateTreeSource());
642 ui::AXTreeSerializer<const ui::AXNode*, 638 ui::AXTreeSerializer<const ui::AXNode*,
643 ui::AXNodeData, 639 ui::AXNodeData,
644 ui::AXTreeData> serializer(tree_source.get()); 640 ui::AXTreeData> serializer(tree_source.get());
645 ui::AXTreeUpdate update; 641 ui::AXTreeUpdate update;
646 serializer.SerializeChanges(tree_->root(), &update); 642 serializer.SerializeChanges(tree_->root(), &update);
647 return update; 643 return update;
648 } 644 }
649 645
650 } // namespace content 646 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698