Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 314024d96d652627116e233e8772c03f145fa547..44f1a27a9797dd89e197affbb2a7910dbd5ec5af 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -102,7 +102,7 @@ |
#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" |
#include "ash/wm/mru_window_tracker.h" |
#include "ash/wm/overlay_event_filter.h" |
-#include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" |
+#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" |
#include "ash/wm/overview/window_selector_controller.h" |
#include "ash/wm/power_button_controller.h" |
#include "ash/wm/resize_shadow_controller.h" |
@@ -847,7 +847,7 @@ void Shell::Init(const ShellInitParams& init_params) { |
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); |
scoped_overview_animation_settings_factory_.reset( |
- new ScopedOverviewAnimationSettingsFactoryAura); |
+ new ScopedOverviewAnimationSettingsFactory); |
msw
2017/05/24 17:39:16
optional nit: base::MakeUnique or avoid unique_ptr
varkha
2017/05/24 18:29:51
Done.
|
window_positioner_ = base::MakeUnique<WindowPositioner>(); |
if (config == Config::CLASSIC) { |