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

Unified Diff: ash/shell.cc

Issue 2171493002: Moves ToastManager from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include 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
« no previous file with comments | « ash/shell.h ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | no next file with comments »
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 4750b3fe201c3664fdb0cad756625a616819b739..55b0da9ac478cd28fc607be6134c9ea81164df72 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -28,7 +28,6 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/locale/locale_notification_controller.h"
#include "ash/common/system/status_area_widget.h"
-#include "ash/common/system/toast/toast_manager.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
@@ -676,7 +675,7 @@ Shell::~Shell() {
DeactivateKeyboard();
// Destroy toasts
- toast_manager_.reset();
+ wm_shell_->DeleteToastManager();
// Destroy SystemTrayDelegate before destroying the status area(s). Make sure
// to deinitialize the shelf first, as it is initialized after the delegate.
@@ -1027,9 +1026,6 @@ void Shell::Init(const ShellInitParams& init_params) {
locale_notification_controller_.reset(new LocaleNotificationController);
- // Initialize toast manager
- toast_manager_.reset(new ToastManager);
-
#if defined(OS_CHROMEOS)
// Create TouchTransformerController before
// WindowTreeHostManager::InitDisplays()
« no previous file with comments | « ash/shell.h ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698