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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: fix mash_unittests 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/aura/wm_shell_aura.h ('k') | ash/common/keyboard/keyboard_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index c5a4db581aa332738d9ff87ba3c1e542f71c9f24..5ac8a64f76a0a59ba18ad9af27b0bb26ee19062c 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -49,12 +49,14 @@ WmShellAura::~WmShellAura() {
WmShell::Set(nullptr);
}
-void WmShellAura::PrepareForShutdown() {
+void WmShellAura::Shutdown() {
if (added_activation_observer_)
Shell::GetInstance()->activation_client()->RemoveObserver(this);
if (added_display_observer_)
Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
+
+ WmShell::Shutdown();
}
WmWindow* WmShellAura::NewContainerWindow() {
@@ -163,10 +165,6 @@ void WmShellAura::OnOverviewModeEnded() {
FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
}
-AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() {
- return Shell::GetInstance()->accessibility_delegate();
-}
-
SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
return Shell::GetInstance()->session_state_delegate();
}
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/keyboard/keyboard_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698