| Index: services/ui/display/screen_manager_forwarding.h
|
| diff --git a/services/ui/display/screen_manager_forwarding.h b/services/ui/display/screen_manager_forwarding.h
|
| index 9eac7837521c878a21b4be9033f638db0ffda66a..51d576456e31525ceb77b8913e91756af2c6d90f 100644
|
| --- a/services/ui/display/screen_manager_forwarding.h
|
| +++ b/services/ui/display/screen_manager_forwarding.h
|
| @@ -43,7 +43,8 @@ class ScreenManagerForwarding
|
| void OnDisplaySnapshotsInvalidated() override;
|
|
|
| // mojom::NativeDisplayDelegate:
|
| - void Initialize(mojom::NativeDisplayObserverPtr observer) override;
|
| + void Initialize(mojom::NativeDisplayObserverPtr observer,
|
| + const InitializeCallback& callback) override;
|
| void TakeDisplayControl(const TakeDisplayControlCallback& callback) override;
|
| void RelinquishDisplayControl(
|
| const RelinquishDisplayControlCallback& callback) override;
|
| @@ -69,9 +70,8 @@ class ScreenManagerForwarding
|
|
|
| private:
|
| // Forwards results from GetDisplays() back with |callback|.
|
| - void ForwardGetDisplays(
|
| - const mojom::NativeDisplayDelegate::GetDisplaysCallback& callback,
|
| - const std::vector<DisplaySnapshot*>& displays);
|
| + void ForwardGetDisplays(const GetDisplaysCallback& callback,
|
| + const std::vector<DisplaySnapshot*>& displays);
|
|
|
| // Forwards results from call to Configure() back with |callback|.
|
| void ForwardConfigure(
|
|
|