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

Unified Diff: ash/wm/overview/scoped_overview_animation_settings_aura.h

Issue 2329433003: Revert of [ash-md] Fades overview header in and out (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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/mus/bridge/wm_window_mus.cc ('k') | ash/wm/overview/scoped_overview_animation_settings_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/scoped_overview_animation_settings_aura.h
diff --git a/ash/wm/overview/scoped_overview_animation_settings_aura.h b/ash/wm/overview/scoped_overview_animation_settings_aura.h
index 966b0edc24570d2fe5f2f140d10e865caf615577..2307f5d72d6bb5a90b25a3d6a2a5a67256d672f1 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_aura.h
+++ b/ash/wm/overview/scoped_overview_animation_settings_aura.h
@@ -5,19 +5,14 @@
#ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_
#define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_
-#include <memory>
-
#include "ash/common/wm/overview/overview_animation_type.h"
#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
#include "base/macros.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
namespace aura {
class Window;
} // namespace aura
-
-namespace ui {
-class ScopedLayerAnimationSettings;
-} // namespace ui
namespace ash {
@@ -28,11 +23,10 @@
ScopedOverviewAnimationSettingsAura(OverviewAnimationType animation_type,
aura::Window* window);
~ScopedOverviewAnimationSettingsAura() override;
- void AddObserver(ui::ImplicitAnimationObserver* observer) override;
private:
// The managed animation settings.
- std::unique_ptr<ui::ScopedLayerAnimationSettings> animation_settings_;
+ ui::ScopedLayerAnimationSettings animation_settings_;
DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettingsAura);
};
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/wm/overview/scoped_overview_animation_settings_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698