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

Replace ScopedObserver with base::ScopedObservation in /content/browser/browser_main_loop.cc.

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

Bug: 1145565
Change-Id: I1acc0d0619824b5eb6491715614fbe326530097e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526921Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826581}
parent 3246d647
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "base/power_monitor/power_monitor_device_source.h" #include "base/power_monitor/power_monitor_device_source.h"
#include "base/process/process_metrics.h" #include "base/process/process_metrics.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/scoped_observer.h" #include "base/scoped_observation.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
...@@ -439,7 +439,7 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver { ...@@ -439,7 +439,7 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver {
explicit GpuDataManagerVisualProxy(GpuDataManagerImpl* gpu_data_manager) explicit GpuDataManagerVisualProxy(GpuDataManagerImpl* gpu_data_manager)
: gpu_data_manager_(gpu_data_manager) { : gpu_data_manager_(gpu_data_manager) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless))
scoped_observer_.Add(gpu_data_manager_); data_manager_observation_.Observe(gpu_data_manager_);
} }
~GpuDataManagerVisualProxy() override = default; ~GpuDataManagerVisualProxy() override = default;
...@@ -466,8 +466,8 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver { ...@@ -466,8 +466,8 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver {
GpuDataManagerImpl* gpu_data_manager_; GpuDataManagerImpl* gpu_data_manager_;
ScopedObserver<GpuDataManagerImpl, GpuDataManagerObserver> scoped_observer_{ base::ScopedObservation<GpuDataManagerImpl, GpuDataManagerObserver>
this}; data_manager_observation_{this};
DISALLOW_COPY_AND_ASSIGN(GpuDataManagerVisualProxy); DISALLOW_COPY_AND_ASSIGN(GpuDataManagerVisualProxy);
}; };
......
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