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

Unified Diff: ash/common/wm/fullscreen_window_finder.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: merge 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
Index: ash/common/wm/fullscreen_window_finder.cc
diff --git a/ash/common/wm/fullscreen_window_finder.cc b/ash/common/wm/fullscreen_window_finder.cc
index 9529e42b344270d6a277986be3620048ee867c83..7dc99afee176a4d5fc05bf5af302bc5a4ff159ba 100644
--- a/ash/common/wm/fullscreen_window_finder.cc
+++ b/ash/common/wm/fullscreen_window_finder.cc
@@ -9,6 +9,7 @@
#include "ash/common/wm_shell.h"
James Cook 2017/03/31 19:29:52 nit: still needed?
sky 2017/03/31 20:15:14 Done.
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/wm/window_util.h"
#include "ui/compositor/layer.h"
namespace ash {
@@ -16,7 +17,7 @@ namespace wm {
WmWindow* GetWindowForFullscreenMode(WmWindow* context) {
WmWindow* topmost_window = nullptr;
- WmWindow* active_window = context->GetShell()->GetActiveWindow();
+ WmWindow* active_window = WmWindow::Get(GetActiveWindow());
if (active_window &&
active_window->GetRootWindow() == context->GetRootWindow() &&
IsSwitchableContainer(active_window->GetParent())) {

Powered by Google App Engine
This is Rietveld 408576698