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

Unified Diff: ash/system/toast/toast_overlay.cc

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)
Patch Set: comments 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
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/toast/toast_overlay.cc
diff --git a/ash/system/toast/toast_overlay.cc b/ash/system/toast/toast_overlay.cc
index 80eb27f2bf6f096a9a2aa07d3af5dfd7fe717048..1c2815b53e69a9d6885e14faced6400c04914b9a 100644
--- a/ash/system/toast/toast_overlay.cc
+++ b/ash/system/toast/toast_overlay.cc
@@ -10,7 +10,6 @@
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
-#include "ash/wm_window.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -224,10 +223,11 @@ ToastOverlay::ToastOverlay(Delegate* delegate,
overlay_widget_->SetContentsView(overlay_view_.get());
overlay_widget_->SetBounds(CalculateOverlayBounds());
- WmWindow* overlay_window = WmWindow::Get(overlay_widget_->GetNativeWindow());
- overlay_window->SetVisibilityAnimationType(
- ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
- overlay_window->SetVisibilityAnimationDuration(
+ aura::Window* overlay_window = overlay_widget_->GetNativeWindow();
+ ::wm::SetWindowVisibilityAnimationType(
+ overlay_window, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+ ::wm::SetWindowVisibilityAnimationDuration(
+ overlay_window,
base::TimeDelta::FromMilliseconds(kSlideAnimationDurationMs));
}
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698