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

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

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: feedback and fix applist 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
« no previous file with comments | « ash/wm/window_util.cc ('k') | chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc
index 40bf04e79f45fc71d841020e2d62d00d5b9f8c74..c9342eac0a5ed65a78142b47d30240ca1d236b59 100644
--- a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc
+++ b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_instance_throttle.h"
-#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shared/app_types.h"
#include "ash/shell.h"
+#include "ash/wm/window_util.h"
#include "base/bind.h"
#include "base/logging.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -53,7 +53,7 @@ void ThrottleInstanceIfNeeded(ash::WmWindow* active) {
ArcInstanceThrottle::ArcInstanceThrottle() {
ash::Shell::GetInstance()->activation_client()->AddObserver(this);
- ThrottleInstanceIfNeeded(ash::WmShell::Get()->GetActiveWindow());
+ ThrottleInstanceIfNeeded(ash::WmWindow::Get(ash::wm::GetActiveWindow()));
}
ArcInstanceThrottle::~ArcInstanceThrottle() {
« no previous file with comments | « ash/wm/window_util.cc ('k') | chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698