Remove the use of aura::Window::env() from components/exo
[email protected]
Bug: 958467
Test: trybot
Change-Id: I539383635c0577ce6ebd4d9b8ecad274c904cd65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613568
Commit-Queue: Jun Mukai <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Reviewed-by: Mitsuru Oshima <[email protected]>
Cr-Commit-Position: refs/heads/master@{#660484}
diff --git a/components/exo/wm_helper_chromeos.h b/components/exo/wm_helper_chromeos.h
index 2fd8879..856d49f 100644
--- a/components/exo/wm_helper_chromeos.h
+++ b/components/exo/wm_helper_chromeos.h
@@ -20,7 +20,6 @@
}
namespace aura {
-class env;
class Window;
namespace client {
class CursorClient;
@@ -51,7 +50,7 @@
// features.
class WMHelperChromeOS : public WMHelper, public VSyncTimingManager::Delegate {
public:
- explicit WMHelperChromeOS(aura::Env* env);
+ WMHelperChromeOS();
~WMHelperChromeOS() override;
static WMHelperChromeOS* GetInstance();
void AddTabletModeObserver(ash::TabletModeObserver* observer);
@@ -62,7 +61,6 @@
ash::WindowTreeHostManager::Observer* observer);
// Overridden from WMHelper
- aura::Env* env() override;
void AddActivationObserver(wm::ActivationChangeObserver* observer) override;
void RemoveActivationObserver(
wm::ActivationChangeObserver* observer) override;
@@ -108,7 +106,6 @@
private:
base::ObserverList<DragDropObserver>::Unchecked drag_drop_observers_;
- aura::Env* const env_;
LifetimeManager lifetime_manager_;
VSyncTimingManager vsync_timing_manager_;