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

Unified Diff: ash/wm/workspace/workspace_layout_manager.h

Issue 2890733005: Refactor backdrop that is currently used in the maximized mode. (Closed)
Patch Set: fix memory issue in AshTouchExplorationManager Created 3 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 | « ash/wm/workspace/backdrop_delegate.h ('k') | ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager.h
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
index b15b5184639caa63675ee8c3066fe007fb6432af..0a6554067ca218a1b3e9949a2894852abb9d3e91 100644
--- a/ash/wm/workspace/workspace_layout_manager.h
+++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -28,7 +28,12 @@ class KeyboardController;
namespace ash {
class RootWindowController;
-class WorkspaceLayoutManagerBackdropDelegate;
+class BackdropDelegate;
+class BackdropController;
+
+namespace test {
+class WorkspaceControllerTestApi;
+}
namespace wm {
class WMEvent;
@@ -51,8 +56,7 @@ class ASH_EXPORT WorkspaceLayoutManager
// A delegate which can be set to add a backdrop behind the top most visible
// window. With the call the ownership of the delegate will be transferred to
// the WorkspaceLayoutManager.
- void SetMaximizeBackdropDelegate(
- std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate);
+ void SetBackdropDelegate(std::unique_ptr<BackdropDelegate> delegate);
// Overridden from aura::LayoutManager:
void OnWindowResized() override;
@@ -100,6 +104,7 @@ class ASH_EXPORT WorkspaceLayoutManager
aura::Window* root_window) override;
private:
+ friend class test::WorkspaceControllerTestApi;
typedef std::set<aura::Window*> WindowSet;
// Adjusts the bounds of all managed windows when the display area changes.
@@ -137,7 +142,7 @@ class ASH_EXPORT WorkspaceLayoutManager
// A window which covers the full container and which gets inserted behind the
// topmost visible window.
- std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> backdrop_delegate_;
+ std::unique_ptr<BackdropController> backdrop_controller_;
ScopedObserver<keyboard::KeyboardController,
keyboard::KeyboardControllerObserver>
« no previous file with comments | « ash/wm/workspace/backdrop_delegate.h ('k') | ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698