Commit fb1b22a0 authored by Sigurdur Asgeirsson's avatar Sigurdur Asgeirsson Committed by Commit Bot

Replace ScopedObserver with base::ScopedObservation in /content/browser/accessibility.

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.
This CL was uploaded by git cl split.

R=jdiggs@igalia.com

Bug: 1145565
Change-Id: I7c12763d1b3461e3d66280174dc6164c46b63c1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526902Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826447}
parent 5dfa652d
...@@ -160,7 +160,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager( ...@@ -160,7 +160,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
use_custom_device_scale_factor_for_testing_(false), use_custom_device_scale_factor_for_testing_(false),
tree_(std::make_unique<ui::AXSerializableTree>()), tree_(std::make_unique<ui::AXSerializableTree>()),
event_generator_(ax_tree()) { event_generator_(ax_tree()) {
tree_observer_.Add(ax_tree()); tree_observation_.Observe(ax_tree());
} }
BrowserAccessibilityManager::BrowserAccessibilityManager( BrowserAccessibilityManager::BrowserAccessibilityManager(
...@@ -175,7 +175,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager( ...@@ -175,7 +175,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
use_custom_device_scale_factor_for_testing_(false), use_custom_device_scale_factor_for_testing_(false),
tree_(std::make_unique<ui::AXSerializableTree>()), tree_(std::make_unique<ui::AXSerializableTree>()),
event_generator_(ax_tree()) { event_generator_(ax_tree()) {
tree_observer_.Add(ax_tree()); tree_observation_.Observe(ax_tree());
Initialize(initial_tree); Initialize(initial_tree);
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "base/callback_forward.h" #include "base/callback_forward.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/scoped_observer.h" #include "base/scoped_observation.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "content/browser/accessibility/accessibility_buildflags.h" #include "content/browser/accessibility/accessibility_buildflags.h"
#include "content/browser/accessibility/browser_accessibility_position.h" #include "content/browser/accessibility/browser_accessibility_position.h"
...@@ -612,7 +612,8 @@ class CONTENT_EXPORT BrowserAccessibilityManager : public ui::AXTreeObserver, ...@@ -612,7 +612,8 @@ class CONTENT_EXPORT BrowserAccessibilityManager : public ui::AXTreeObserver,
// This member needs to be destructed before any observed AXTrees. Since // This member needs to be destructed before any observed AXTrees. Since
// destructors for non-static member fields are called in the reverse order of // destructors for non-static member fields are called in the reverse order of
// declaration, do not move this member above other members. // declaration, do not move this member above other members.
ScopedObserver<ui::AXTree, ui::AXTreeObserver> tree_observer_{this}; base::ScopedObservation<ui::AXTree, ui::AXTreeObserver> tree_observation_{
this};
DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager); DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment