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

Unified Diff: mash/wm/root_window_controller.h

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 7 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 | « mash/wm/resources/mash_wm_resources.grd ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
deleted file mode 100644
index 80b1b31a4a4f9a19cb444a1499be016e91fc7f75..0000000000000000000000000000000000000000
--- a/mash/wm/root_window_controller.h
+++ /dev/null
@@ -1,141 +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 MASH_WM_ROOT_WINDOW_CONTROLLER_H_
-#define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
-
-#include <memory>
-
-#include "ash/public/interfaces/container.mojom.h"
-#include "components/mus/public/cpp/window_observer.h"
-#include "components/mus/public/cpp/window_tree_client.h"
-#include "components/mus/public/cpp/window_tree_client_delegate.h"
-#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
-#include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/wm/shelf_layout_manager_delegate.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "ui/display/display.h"
-
-namespace ash {
-class AlwaysOnTopController;
-}
-
-namespace mus {
-class WindowManagerClient;
-}
-
-namespace shell {
-class Connector;
-}
-
-namespace ui {
-class Event;
-}
-
-namespace mash {
-namespace wm {
-
-class LayoutManager;
-class ShadowController;
-class ShelfLayoutManager;
-class StatusLayoutManager;
-class WindowManager;
-class WindowManagerApplication;
-class WmRootWindowControllerMus;
-class WmShelfMus;
-class WmTestBase;
-class WmTestHelper;
-
-// RootWindowController manages the windows and state for a single display.
-//
-// RootWindowController deletes itself when the root mus::Window is destroyed.
-// You can trigger deletion explicitly by way of Destroy().
-class RootWindowController : public mus::WindowObserver,
- public mus::WindowTreeClientDelegate,
- public ShelfLayoutManagerDelegate {
- public:
- static RootWindowController* CreateFromDisplay(
- WindowManagerApplication* app,
- mus::mojom::DisplayPtr display,
- mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request);
-
- // Deletes this.
- void Destroy();
-
- shell::Connector* GetConnector();
-
- mus::Window* root() { return root_; }
-
- int window_count() { return window_count_; }
- void IncrementWindowCount() { ++window_count_; }
-
- mus::Window* GetWindowForContainer(ash::mojom::Container container);
- bool WindowIsContainer(const mus::Window* window) const;
-
- WindowManager* window_manager() { return window_manager_.get(); }
-
- mus::WindowManagerClient* window_manager_client();
-
- void OnAccelerator(uint32_t id, const ui::Event& event);
-
- const display::Display& display() const { return display_; }
-
- ShelfLayoutManager* GetShelfLayoutManager();
- StatusLayoutManager* GetStatusLayoutManager();
-
- ash::AlwaysOnTopController* always_on_top_controller() {
- return always_on_top_controller_.get();
- }
-
- WmShelfMus* wm_shelf() { return wm_shelf_.get(); }
-
- private:
- friend class WmTestBase;
- friend class WmTestHelper;
-
- explicit RootWindowController(WindowManagerApplication* app);
- ~RootWindowController() override;
-
- void AddAccelerators();
-
- // WindowTreeClientDelegate:
- void OnEmbed(mus::Window* root) override;
- void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override;
- void OnEventObserved(const ui::Event& event, mus::Window* target) override;
-
- // mus::WindowObserver:
- void OnWindowDestroyed(mus::Window* window) override;
-
- // ShelfLayoutManagerDelegate:
- void OnShelfWindowAvailable() override;
-
- // Sets up the window containers used for z-space management.
- void CreateContainer(ash::mojom::Container container,
- ash::mojom::Container parent_container);
- void CreateContainers();
-
- WindowManagerApplication* app_;
- mus::Window* root_;
- int window_count_;
-
- std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
- std::unique_ptr<WmShelfMus> wm_shelf_;
-
- std::unique_ptr<WindowManager> window_manager_;
-
- std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
-
- std::unique_ptr<ShadowController> shadow_controller_;
-
- display::Display display_;
-
- std::unique_ptr<ash::AlwaysOnTopController> always_on_top_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(RootWindowController);
-};
-
-} // namespace wm
-} // namespace mash
-
-#endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
« no previous file with comments | « mash/wm/resources/mash_wm_resources.grd ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698