| 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
|
| deleted file mode 100644
|
| index 14e3c534f490b093b7b2eb64dcb4b52c0f726f62..0000000000000000000000000000000000000000
|
| --- a/ash/mus/bridge/wm_shell_mus.h
|
| +++ /dev/null
|
| @@ -1,153 +0,0 @@
|
| -// Copyright 2016 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
|
| -#define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
|
| -
|
| -#include <stdint.h>
|
| -
|
| -#include <memory>
|
| -#include <vector>
|
| -
|
| -#include "ash/wm_shell.h"
|
| -#include "base/macros.h"
|
| -
|
| -namespace aura {
|
| -class WindowTreeClient;
|
| -}
|
| -
|
| -namespace views {
|
| -class PointerWatcherEventRouter;
|
| -}
|
| -
|
| -namespace ash {
|
| -
|
| -class AcceleratorControllerDelegateAura;
|
| -class PointerWatcherAdapter;
|
| -class RootWindowController;
|
| -
|
| -namespace mus {
|
| -
|
| -class AcceleratorControllerDelegateMus;
|
| -class AcceleratorControllerRegistrar;
|
| -class ImmersiveHandlerFactoryMus;
|
| -class WindowManager;
|
| -class WmShellMusTestApi;
|
| -
|
| -// WmShell implementation for mus.
|
| -class WmShellMus : public WmShell {
|
| - public:
|
| - // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
|
| - // created. If false, the SessionStateDelegate from Shell is used.
|
| - WmShellMus(WmWindow* primary_root_window,
|
| - WindowManager* window_manager,
|
| - views::PointerWatcherEventRouter* pointer_watcher_event_router,
|
| - bool create_session_state_delegate_stub);
|
| - ~WmShellMus() override;
|
| -
|
| - static WmShellMus* Get();
|
| -
|
| - ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
|
| -
|
| - AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() {
|
| - return mus_state_->accelerator_controller_delegate.get();
|
| - }
|
| -
|
| - aura::WindowTreeClient* window_tree_client();
|
| -
|
| - WindowManager* window_manager() { return window_manager_; }
|
| -
|
| - // WmShell:
|
| - void Shutdown() override;
|
| - bool IsRunningInMash() const override;
|
| - Config GetAshConfig() const override;
|
| - WmWindow* GetPrimaryRootWindow() override;
|
| - WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
|
| - const display::ManagedDisplayInfo& GetDisplayInfo(
|
| - int64_t display_id) const override;
|
| - bool IsActiveDisplayId(int64_t display_id) const override;
|
| - display::Display GetFirstDisplay() const override;
|
| - bool IsInUnifiedMode() const override;
|
| - bool IsInUnifiedModeIgnoreMirroring() const override;
|
| - void SetDisplayWorkAreaInsets(WmWindow* window,
|
| - const gfx::Insets& insets) override;
|
| - void LockCursor() override;
|
| - void UnlockCursor() override;
|
| - bool IsMouseEventsEnabled() override;
|
| - std::vector<WmWindow*> GetAllRootWindows() override;
|
| - void RecordGestureAction(GestureActionType action) override;
|
| - void RecordUserMetricsAction(UserMetricsAction action) override;
|
| - void RecordTaskSwitchMetric(TaskSwitchSource source) override;
|
| - std::unique_ptr<WindowResizer> CreateDragWindowResizer(
|
| - std::unique_ptr<WindowResizer> next_window_resizer,
|
| - wm::WindowState* window_state) override;
|
| - std::unique_ptr<WindowCycleEventFilter> CreateWindowCycleEventFilter()
|
| - override;
|
| - std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
|
| - override;
|
| - std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
|
| - WmWindow* workspace_window) override;
|
| - std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
|
| - CreateScopedDisableInternalMouseAndKeyboard() override;
|
| - std::unique_ptr<ImmersiveFullscreenController>
|
| - CreateImmersiveFullscreenController() override;
|
| - std::unique_ptr<KeyboardUI> CreateKeyboardUI() override;
|
| - std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
|
| - SessionStateDelegate* GetSessionStateDelegate() override;
|
| - void AddDisplayObserver(WmDisplayObserver* observer) override;
|
| - void RemoveDisplayObserver(WmDisplayObserver* observer) override;
|
| - void AddPointerWatcher(views::PointerWatcher* watcher,
|
| - views::PointerWatcherEventTypes events) override;
|
| - void RemovePointerWatcher(views::PointerWatcher* watcher) override;
|
| - bool IsTouchDown() override;
|
| - void ToggleIgnoreExternalKeyboard() override;
|
| - void SetLaserPointerEnabled(bool enabled) override;
|
| - void SetPartialMagnifierEnabled(bool enabled) override;
|
| - void CreatePointerWatcherAdapter() override;
|
| - void CreatePrimaryHost() override;
|
| - void InitHosts(const ShellInitParams& init_params) override;
|
| - std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
|
| -
|
| - private:
|
| - friend class WmShellMusTestApi;
|
| -
|
| - struct MashSpecificState {
|
| - MashSpecificState();
|
| - ~MashSpecificState();
|
| -
|
| - views::PointerWatcherEventRouter* pointer_watcher_event_router = nullptr;
|
| - std::unique_ptr<AcceleratorControllerDelegateMus>
|
| - accelerator_controller_delegate;
|
| - std::unique_ptr<AcceleratorControllerRegistrar>
|
| - accelerator_controller_registrar;
|
| - std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory;
|
| - };
|
| -
|
| - struct MusSpecificState {
|
| - MusSpecificState();
|
| - ~MusSpecificState();
|
| -
|
| - std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter;
|
| - std::unique_ptr<AcceleratorControllerDelegateAura>
|
| - accelerator_controller_delegate;
|
| - };
|
| -
|
| - WindowManager* window_manager_;
|
| -
|
| - WmWindow* primary_root_window_;
|
| -
|
| - // Only one of |mash_state_| or |mus_state_| is created, depending upon
|
| - // Config.
|
| - std::unique_ptr<MashSpecificState> mash_state_;
|
| - std::unique_ptr<MusSpecificState> mus_state_;
|
| -
|
| - std::unique_ptr<SessionStateDelegate> session_state_delegate_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(WmShellMus);
|
| -};
|
| -
|
| -} // namespace mus
|
| -} // namespace ash
|
| -
|
| -#endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
|
|
|