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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2084503007: Moves WindowSelectorController onto WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_overview
Patch Set: cleanup Created 4 years, 6 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
« ash/common/wm_shell.cc ('K') | « ash/shell.h ('k') | ash/system/overview/overview_button_tray.cc » ('j') | ash/wm/gestures/overview_gesture_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index ccbaab270e96a81a878923ad048968155f24a196..a6dbfd806783c0ce9a107a9a89f612f37867ba5b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -25,7 +25,6 @@
#include "ash/common/system/locale/locale_notification_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
-#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm/window_positioner.h"
#include "ash/common/wm_shell.h"
@@ -729,7 +728,7 @@ Shell::~Shell() {
resize_shadow_controller_.reset();
window_cycle_controller_.reset();
- window_selector_controller_.reset();
+ wm_shell_->DeleteWindowSelectorController();
// |shelf_window_watcher_| has a weak pointer to |shelf_Model_|
// and has window observers.
@@ -1030,7 +1029,7 @@ void Shell::Init(const ShellInitParams& init_params) {
high_contrast_controller_.reset(new HighContrastController);
video_detector_.reset(new VideoDetector);
- window_selector_controller_.reset(new WindowSelectorController());
+ wm_shell_->CreateWindowSelectorController();
window_cycle_controller_.reset(new WindowCycleController());
tooltip_controller_.reset(new views::corewm::TooltipController(
« ash/common/wm_shell.cc ('K') | « ash/shell.h ('k') | ash/system/overview/overview_button_tray.cc » ('j') | ash/wm/gestures/overview_gesture_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698