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

Unified Diff: ash/shell.cc

Issue 2157393002: Moves WindowCycleList/Controller to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 11981e761b3818dc6e37dd509111b9e91b05787b..9ec084d9de21bfa49c64519696571bbeed4cc919 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -79,7 +79,6 @@
#include "ash/wm/toplevel_window_event_handler.h"
#include "ash/wm/video_detector.h"
#include "ash/wm/window_animations.h"
-#include "ash/wm/window_cycle_controller.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace_controller.h"
@@ -703,7 +702,7 @@ Shell::~Shell() {
shadow_controller_.reset();
resize_shadow_controller_.reset();
- window_cycle_controller_.reset();
+ wm_shell_->DeleteWindowCycleController();
wm_shell_->DeleteWindowSelectorController();
// |shelf_window_watcher_| has a weak pointer to |shelf_Model_|
@@ -994,7 +993,7 @@ void Shell::Init(const ShellInitParams& init_params) {
high_contrast_controller_.reset(new HighContrastController);
video_detector_.reset(new VideoDetector);
- window_cycle_controller_.reset(new WindowCycleController());
+ wm_shell_->CreateWindowCycleController();
tooltip_controller_.reset(new views::corewm::TooltipController(
std::unique_ptr<views::corewm::Tooltip>(new views::corewm::TooltipAura)));
« ash/common/wm_shell.cc ('K') | « ash/shell.h ('k') | ash/wm/window_cycle_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698