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

Unified Diff: ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc

Issue 2895713002: [mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode (Closed)
Patch Set: Address nits, unit_tests target compiles Created 3 years, 7 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: ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc
index 2feed273d99d50f71bb564474beeb2035e243750..1bdfe42864b6d735b40b8fca1a199ea194731bae 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc
+++ b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.cc
@@ -5,8 +5,8 @@
#include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
#include "ash/wm/overview/scoped_overview_animation_settings_aura.h"
-#include "ash/wm_window.h"
#include "base/memory/ptr_util.h"
+#include "ui/aura/window.h"
namespace ash {
@@ -19,9 +19,9 @@ ScopedOverviewAnimationSettingsFactoryAura::
std::unique_ptr<ScopedOverviewAnimationSettings>
ScopedOverviewAnimationSettingsFactoryAura::CreateOverviewAnimationSettings(
OverviewAnimationType animation_type,
- WmWindow* window) {
- return base::MakeUnique<ScopedOverviewAnimationSettingsAura>(
- animation_type, WmWindow::GetAuraWindow(window));
+ aura::Window* window) {
+ return base::MakeUnique<ScopedOverviewAnimationSettingsAura>(animation_type,
+ window);
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698