Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3358)

Unified Diff: chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h

Issue 2736753005: Converts WmActivationObserver to aura::client::ActivationChangeObserver (Closed)
Patch Set: cleanup Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h
index 00c8f87f4cc188e59095c07106541aa68240030f..181eadd97e8261afb304d43127db7aa6f74ad207 100644
--- a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h
+++ b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h
@@ -5,22 +5,23 @@
#ifndef CHROME_BROWSER_CHROMEOS_ARC_BOOT_PHASE_MONITOR_ARC_INSTANCE_THROTTLE_H_
#define CHROME_BROWSER_CHROMEOS_ARC_BOOT_PHASE_MONITOR_ARC_INSTANCE_THROTTLE_H_
-#include "ash/common/wm_activation_observer.h"
#include "base/macros.h"
+#include "ui/wm/public/activation_change_observer.h"
namespace arc {
// A class that watches window activations and prioritizes the ARC instance when
// one of ARC windows is activated. The class also unprioritizes the instance
// when non-ARC window such as Chrome is activated.
-class ArcInstanceThrottle : public ash::WmActivationObserver {
+class ArcInstanceThrottle : public aura::client::ActivationChangeObserver {
public:
ArcInstanceThrottle();
~ArcInstanceThrottle() override;
- // ash::WmActivationObserver overrides:
- void OnWindowActivated(ash::WmWindow* gained_active,
- ash::WmWindow* lost_active) override;
+ // aura::client::ActivationChangeObserver overrides:
+ void OnWindowActivated(ActivationReason reason,
+ aura::Window* gained_active,
+ aura::Window* lost_active) override;
private:
DISALLOW_COPY_AND_ASSIGN(ArcInstanceThrottle);

Powered by Google App Engine
This is Rietveld 408576698