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

Unified Diff: ash/common/wm/overview/window_selector.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/mru_window_tracker.cc ('k') | ash/common/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_selector.cc
diff --git a/ash/common/wm/overview/window_selector.cc b/ash/common/wm/overview/window_selector.cc
index 4d375a935485e1e1e25288c6583adc13634ebdfb..ede256552b725438ac2d6ce3deb02997e503e526 100644
--- a/ash/common/wm/overview/window_selector.cc
+++ b/ash/common/wm/overview/window_selector.cc
@@ -27,6 +27,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
+#include "ash/wm/window_util.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/metrics/histogram_macros.h"
@@ -217,7 +218,7 @@ bool WindowSelector::IsSelectable(WmWindow* window) {
WindowSelector::WindowSelector(WindowSelectorDelegate* delegate)
: delegate_(delegate),
- restore_focus_window_(WmShell::Get()->GetFocusedWindow()),
+ restore_focus_window_(WmWindow::Get(wm::GetFocusedWindow())),
ignore_activations_(false),
selected_grid_index_(0),
overview_start_time_(base::Time::Now()),
« no previous file with comments | « ash/common/wm/mru_window_tracker.cc ('k') | ash/common/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698