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

Retire ScopedObserver in /chrome/browser/ui/views/relaunch_notification.

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

Bug: 1145565
Change-Id: I09bb3f756fd726ccf3e764bef51ff5ccc0a62bd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2547963
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828961}
parent cbdf4c2e
......@@ -143,13 +143,15 @@ bool RelaunchNotificationControllerPlatformImpl::CanScheduleReboot() {
}
void RelaunchNotificationControllerPlatformImpl::StartObserving() {
if (!display_observer_.IsObservingSources())
display_observer_.Add(ash::Shell::Get()->display_configurator());
if (!session_observer_.IsObservingSources())
session_observer_.Add(session_manager::SessionManager::Get());
if (!display_observation_.IsObserving())
display_observation_.Observe(ash::Shell::Get()->display_configurator());
if (!session_observation_.IsObserving())
session_observation_.Observe(session_manager::SessionManager::Get());
}
void RelaunchNotificationControllerPlatformImpl::StopObserving() {
display_observer_.RemoveAll();
session_observer_.RemoveAll();
if (display_observation_.IsObserving())
display_observation_.RemoveObservation();
if (session_observation_.IsObserving())
session_observation_.RemoveObservation();
}
......@@ -8,7 +8,7 @@
#include <memory>
#include "base/callback.h"
#include "base/scoped_observer.h"
#include "base/scoped_observation.h"
#include "base/time/time.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
......@@ -77,12 +77,12 @@ class RelaunchNotificationControllerPlatformImpl
base::OnceCallback<base::Time()> on_visible_;
ScopedObserver<display::DisplayConfigurator,
display::DisplayConfigurator::Observer>
display_observer_{this};
ScopedObserver<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observer_{this};
base::ScopedObservation<display::DisplayConfigurator,
display::DisplayConfigurator::Observer>
display_observation_{this};
base::ScopedObservation<session_manager::SessionManager,
session_manager::SessionManagerObserver>
session_observation_{this};
DISALLOW_COPY_AND_ASSIGN(RelaunchNotificationControllerPlatformImpl);
};
......
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