Chromium Code Reviews| Index: ash/common/system/toast/toast_overlay.cc |
| diff --git a/ash/common/system/toast/toast_overlay.cc b/ash/common/system/toast/toast_overlay.cc |
| index 60a8e2702e4526480085ce4f29a09d1d82337292..8c3d08fdf22d3e0fca9f3f38264103ff5659380b 100644 |
| --- a/ash/common/system/toast/toast_overlay.cc |
| +++ b/ash/common/system/toast/toast_overlay.cc |
| @@ -5,7 +5,7 @@ |
| #include "ash/common/system/toast/toast_overlay.h" |
| #include "ash/common/shelf/wm_shelf.h" |
| -#include "ash/common/wm_lookup.h" |
| +#include "ash/common/strings/grit/ash_strings.h" |
|
sky
2017/03/02 23:49:57
Did you mean to add this include?
thanhph1
2017/03/03 16:29:53
I thought this was the result of the merge. I remo
|
| #include "ash/common/wm_shell.h" |
| #include "ash/common/wm_window.h" |
| #include "ash/public/cpp/shell_window_ids.h" |
| @@ -237,8 +237,7 @@ ToastOverlay::ToastOverlay(Delegate* delegate, |
| overlay_widget_->SetContentsView(overlay_view_.get()); |
| overlay_widget_->SetBounds(CalculateOverlayBounds()); |
| - WmWindow* overlay_window = |
| - WmLookup::Get()->GetWindowForWidget(overlay_widget_.get()); |
| + WmWindow* overlay_window = WmWindow::Get(overlay_widget_->GetNativeWindow()); |
| overlay_window->SetVisibilityAnimationType( |
| ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); |
| overlay_window->SetVisibilityAnimationDuration( |