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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: 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/mus/bridge/shell_port_mash.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index c9bfdf346abd36986ff90d985b084893c0d96b9a..70450454492e38e15041406f29b67e45c94712e2 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -25,7 +25,6 @@
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
@@ -452,8 +451,8 @@ void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
// window.
if (Shell::Get()->session_controller()->IsUserSessionBlocked() &&
keyboard_is_about_to_hide) {
- WmWindow* window = WmWindow::Get(shelf_widget_->GetNativeWindow());
- ShellPort::Get()->SetDisplayWorkAreaInsets(window, gfx::Insets());
+ ShellPort::Get()->SetDisplayWorkAreaInsets(shelf_widget_->GetNativeWindow(),
+ gfx::Insets());
}
}
@@ -642,8 +641,8 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity(
// if keyboard is not shown.
if (!state_.IsAddingSecondaryUser() || !keyboard_bounds_.IsEmpty())
insets = target_bounds.work_area_insets;
- WmWindow* shelf_window = WmWindow::Get(shelf_widget_->GetNativeWindow());
- ShellPort::Get()->SetDisplayWorkAreaInsets(shelf_window, insets);
+ ShellPort::Get()->SetDisplayWorkAreaInsets(
+ shelf_widget_->GetNativeWindow(), insets);
}
}
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698