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

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

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 years, 9 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/common/wm_shell.h ('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 f66a8f2cad43e0b9ebbacc87cff92bc0d5500b31..eb756e7adbb990653786b67bef157f2098137033 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -23,6 +23,7 @@ class PointerWatcherEventRouter;
namespace ash {
+class AcceleratorControllerDelegateAura;
class RootWindowController;
namespace mus {
@@ -48,8 +49,8 @@ class WmShellMus : public WmShell {
ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
- AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
- return accelerator_controller_delegate_.get();
+ AcceleratorControllerDelegateAura* accelerator_controller_delegate_classic() {
+ return accelerator_controller_delegate_classic_.get();
}
aura::WindowTreeClient* window_tree_client();
@@ -59,6 +60,7 @@ class WmShellMus : public WmShell {
// WmShell:
void Shutdown() override;
bool IsRunningInMash() const override;
+ Config GetConfig() const override;
WmWindow* GetFocusedWindow() override;
WmWindow* GetActiveWindow() override;
WmWindow* GetCaptureWindow() override;
@@ -119,8 +121,12 @@ class WmShellMus : public WmShell {
WmWindow* primary_root_window_;
views::PointerWatcherEventRouter* pointer_watcher_event_router_;
+ // |accelerator_controller_delegate_classic_| is created in MUS mode,
+ // |accelerator_controller_delegate_| in MASH mode.
std::unique_ptr<AcceleratorControllerDelegateMus>
accelerator_controller_delegate_;
+ std::unique_ptr<AcceleratorControllerDelegateAura>
+ accelerator_controller_delegate_classic_;
std::unique_ptr<AcceleratorControllerRegistrar>
accelerator_controller_registrar_;
std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698