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

Unified Diff: ash/common/wm/workspace/workspace_layout_manager.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: feedback and fix applist Created 3 years, 9 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/common/wm/window_positioning_utils.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/workspace/workspace_layout_manager.cc
diff --git a/ash/common/wm/workspace/workspace_layout_manager.cc b/ash/common/wm/workspace/workspace_layout_manager.cc
index 32f12937334181fce6e80fc9552b8e2c4e387568..88a70043811d311b4d80a5c18f1beed7de074553 100644
--- a/ash/common/wm/workspace/workspace_layout_manager.cc
+++ b/ash/common/wm/workspace/workspace_layout_manager.cc
@@ -24,6 +24,7 @@
#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_state_aura.h"
+#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/base/ui_base_switches.h"
@@ -144,7 +145,7 @@ void WorkspaceLayoutManager::OnKeyboardBoundsChanging(
if (!change_work_area)
return;
- WmWindow* window = shell_->GetActiveWindow();
+ WmWindow* window = WmWindow::Get(wm::GetActiveWindow());
if (!window)
return;
« no previous file with comments | « ash/common/wm/window_positioning_utils.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698