Commit 88b833af authored by ben's avatar ben Committed by Commit bot

Add a basic task switcher to the simple window manager.

R=sky@chromium.org

Review-Url: https://codereview.chromium.org/2571653002
Cr-Commit-Position: refs/heads/master@{#437968}
parent 19d351e0
This diff is collapsed.
...@@ -47,7 +47,11 @@ class SimpleWM : public service_manager::Service, ...@@ -47,7 +47,11 @@ class SimpleWM : public service_manager::Service,
~SimpleWM() override; ~SimpleWM() override;
private: private:
class DisplayLayoutManager;
class FrameView; class FrameView;
class WindowListModel;
class WindowListModelObserver;
class WindowListView;
// service_manager::Service: // service_manager::Service:
void OnStart() override; void OnStart() override;
...@@ -93,18 +97,22 @@ class SimpleWM : public service_manager::Service, ...@@ -93,18 +97,22 @@ class SimpleWM : public service_manager::Service,
FrameView* GetFrameViewForClientWindow(aura::Window* client_window); FrameView* GetFrameViewForClientWindow(aura::Window* client_window);
void OnWindowListViewItemActivated(aura::Window* index);
std::unique_ptr<views::AuraInit> aura_init_; std::unique_ptr<views::AuraInit> aura_init_;
::wm::WMState wm_state_; ::wm::WMState wm_state_;
std::unique_ptr<display::ScreenBase> screen_; std::unique_ptr<display::ScreenBase> screen_;
aura::PropertyConverter property_converter_; aura::PropertyConverter property_converter_;
aura::test::TestFocusClient focus_client_; aura::test::TestFocusClient focus_client_;
std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
aura::Window* root_ = nullptr; aura::Window* display_root_ = nullptr;
aura::Window* window_root_ = nullptr;
aura::WindowManagerClient* window_manager_client_ = nullptr; aura::WindowManagerClient* window_manager_client_ = nullptr;
std::unique_ptr<aura::WindowTreeClient> window_tree_client_; std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
std::unique_ptr<ui::Gpu> gpu_; std::unique_ptr<ui::Gpu> gpu_;
std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
std::map<aura::Window*, FrameView*> client_window_to_frame_view_; std::map<aura::Window*, FrameView*> client_window_to_frame_view_;
std::unique_ptr<WindowListModel> window_list_model_;
bool started_ = false; bool started_ = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment