Commit 636a2464 authored by Sigurdur Asgeirsson's avatar Sigurdur Asgeirsson Committed by Commit Bot

Retire ScopedObserver in /components/permissions.

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=andypaicu@chromium.org

Bug: 1145565
Change-Id: I9075e3c8594c64f0a4a4d2b5e5320e1d21308e32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533135
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Commit-Queue: Andy Paicu <andypaicu@chromium.org>
Reviewed-by: default avatarAndy Paicu <andypaicu@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826772}
parent f0e7f896
...@@ -8,7 +8,7 @@ namespace permissions { ...@@ -8,7 +8,7 @@ namespace permissions {
PermissionRequestObserver::PermissionRequestObserver( PermissionRequestObserver::PermissionRequestObserver(
content::WebContents* web_contents) { content::WebContents* web_contents) {
observer_.Add(PermissionRequestManager::FromWebContents(web_contents)); observation_.Observe(PermissionRequestManager::FromWebContents(web_contents));
} }
PermissionRequestObserver::~PermissionRequestObserver() = default; PermissionRequestObserver::~PermissionRequestObserver() = default;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define COMPONENTS_PERMISSIONS_TEST_PERMISSION_REQUEST_OBSERVER_H_ #define COMPONENTS_PERMISSIONS_TEST_PERMISSION_REQUEST_OBSERVER_H_
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/scoped_observer.h" #include "base/scoped_observation.h"
#include "components/permissions/permission_request_manager.h" #include "components/permissions/permission_request_manager.h"
namespace permissions { namespace permissions {
...@@ -30,8 +30,9 @@ class PermissionRequestObserver : public PermissionRequestManager::Observer { ...@@ -30,8 +30,9 @@ class PermissionRequestObserver : public PermissionRequestManager::Observer {
void OnBubbleAdded() override; void OnBubbleAdded() override;
private: private:
ScopedObserver<PermissionRequestManager, PermissionRequestManager::Observer> base::ScopedObservation<PermissionRequestManager,
observer_{this}; PermissionRequestManager::Observer>
observation_{this};
base::RunLoop loop_; base::RunLoop loop_;
bool request_shown_ = false; bool request_shown_ = false;
}; };
......
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