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

Unified Diff: ash/common/wm_shell.cc

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: cleanup, fix test 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/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index bb012d7abb237310a4c141fbfe0bbdaf163b45e2..15bebd1f69a180003d6c11e0f146dde8bcfe46fc 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/common/accessibility_delegate.h"
#include "ash/common/focus_cycler.h"
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/shell_delegate.h"
@@ -45,9 +46,15 @@ WmShell* WmShell::Get() {
void WmShell::Initialize() {
// Some delegates access WmShell during their construction. Create them here
// instead of the WmShell constructor.
+ accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
media_delegate_.reset(delegate_->CreateMediaDelegate());
}
+void WmShell::Shutdown() {
+ media_delegate_.reset();
James Cook 2016/07/14 23:31:46 Not strictly necessary, but a little clearer I thi
msw 2016/07/15 15:33:14 I'd be wary of adding explicit destruction if none
James Cook 2016/07/15 17:03:06 Done. Removed media_delegate_.reset(). Added a com
+ accessibility_delegate_.reset();
+}
+
void WmShell::OnMaximizeModeStarted() {
FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
}

Powered by Google App Engine
This is Rietveld 408576698