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

Unified Diff: ash/system/tray/tray_background_view.cc

Issue 2888013002: chromeos: Remove some WmWindow usage from ash/system (Closed)
Patch Set: header 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/system/tray/tray_background_view.cc
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index ceefaacb9fb5f47d953606caa87715cbb027c25b..fa8e816da13b901257693630a59bdc79b62b35df 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -15,7 +15,6 @@
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_container.h"
#include "ash/system/tray/tray_event_filter.h"
-#include "ash/wm_window.h"
#include "base/memory/ptr_util.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/compositor/layer.h"
@@ -31,6 +30,7 @@
#include "ui/views/animation/ink_drop_mask.h"
#include "ui/views/background.h"
#include "ui/views/layout/fill_layout.h"
+#include "ui/wm/core/window_animations.h"
namespace {
@@ -171,12 +171,12 @@ void TrayBackgroundView::Initialize() {
// static
void TrayBackgroundView::InitializeBubbleAnimations(
views::Widget* bubble_widget) {
- WmWindow* window = WmWindow::Get(bubble_widget->GetNativeWindow());
- window->SetVisibilityAnimationType(
- ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
- window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
- window->SetVisibilityAnimationDuration(
- base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
+ aura::Window* window = bubble_widget->GetNativeWindow();
+ ::wm::SetWindowVisibilityAnimationType(
+ window, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+ ::wm::SetWindowVisibilityAnimationTransition(window, ::wm::ANIMATE_HIDE);
+ ::wm::SetWindowVisibilityAnimationDuration(
+ window, base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
}
void TrayBackgroundView::SetVisible(bool visible) {

Powered by Google App Engine
This is Rietveld 408576698