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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

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/mus/accessibility_delegate_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 63f5f59415e014b16d7d7fb3490bbee52cf876c7..64fce4f16fdbe7752dea345c08307de29a4e9264 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -33,8 +33,7 @@ class WmWindowMus;
class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
public:
WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
- ::ui::WindowTreeClient* client,
- shell::Connector* connector);
+ ::ui::WindowTreeClient* client);
~WmShellMus() override;
static WmShellMus* Get();
@@ -74,7 +73,6 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
CreateScopedDisableInternalMouseAndKeyboard() override;
void OnOverviewModeStarting() override;
void OnOverviewModeEnded() override;
- AccessibilityDelegate* GetAccessibilityDelegate() override;
SessionStateDelegate* GetSessionStateDelegate() override;
void AddActivationObserver(WmActivationObserver* observer) override;
void RemoveActivationObserver(WmActivationObserver* observer) override;
@@ -98,14 +96,11 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
void OnDidDestroyClient(::ui::WindowTreeClient* client) override;
::ui::WindowTreeClient* client_;
- shell::Connector* connector_;
std::vector<WmRootWindowControllerMus*> root_window_controllers_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
- std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
-
base::ObserverList<WmActivationObserver> activation_observers_;
DISALLOW_COPY_AND_ASSIGN(WmShellMus);
« no previous file with comments | « ash/mus/accessibility_delegate_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698