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

Side by Side Diff: ash/wm/workspace/workspace_layout_manager.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
6 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ 6 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
7 7
8 #include <memory>
8 #include <set> 9 #include <set>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "ash/shell_observer.h" 12 #include "ash/shell_observer.h"
12 #include "ash/wm/window_state_observer.h" 13 #include "ash/wm/window_state_observer.h"
13 #include "ash/wm/wm_types.h" 14 #include "ash/wm/wm_types.h"
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h"
17 #include "ui/aura/layout_manager.h" 17 #include "ui/aura/layout_manager.h"
18 #include "ui/aura/window_observer.h" 18 #include "ui/aura/window_observer.h"
19 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
20 #include "ui/keyboard/keyboard_controller_observer.h" 20 #include "ui/keyboard/keyboard_controller_observer.h"
21 #include "ui/wm/public/activation_change_observer.h" 21 #include "ui/wm/public/activation_change_observer.h"
22 22
23 namespace aura { 23 namespace aura {
24 class RootWindow; 24 class RootWindow;
25 class Window; 25 class Window;
26 } 26 }
(...skipping 22 matching lines...) Expand all
49 public: 49 public:
50 explicit WorkspaceLayoutManager(aura::Window* window); 50 explicit WorkspaceLayoutManager(aura::Window* window);
51 ~WorkspaceLayoutManager() override; 51 ~WorkspaceLayoutManager() override;
52 52
53 void SetShelf(ShelfLayoutManager* shelf); 53 void SetShelf(ShelfLayoutManager* shelf);
54 54
55 // A delegate which can be set to add a backdrop behind the top most visible 55 // A delegate which can be set to add a backdrop behind the top most visible
56 // window. With the call the ownership of the delegate will be transferred to 56 // window. With the call the ownership of the delegate will be transferred to
57 // the WorkspaceLayoutManager. 57 // the WorkspaceLayoutManager.
58 void SetMaximizeBackdropDelegate( 58 void SetMaximizeBackdropDelegate(
59 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate); 59 std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate);
60 60
61 // Overridden from aura::LayoutManager: 61 // Overridden from aura::LayoutManager:
62 void OnWindowResized() override {} 62 void OnWindowResized() override {}
63 void OnWindowAddedToLayout(aura::Window* child) override; 63 void OnWindowAddedToLayout(aura::Window* child) override;
64 void OnWillRemoveWindowFromLayout(aura::Window* child) override; 64 void OnWillRemoveWindowFromLayout(aura::Window* child) override;
65 void OnWindowRemovedFromLayout(aura::Window* child) override; 65 void OnWindowRemovedFromLayout(aura::Window* child) override;
66 void OnChildWindowVisibilityChanged(aura::Window* child, 66 void OnChildWindowVisibilityChanged(aura::Window* child,
67 bool visibile) override; 67 bool visibile) override;
68 void SetChildBounds(aura::Window* child, 68 void SetChildBounds(aura::Window* child,
69 const gfx::Rect& requested_bounds) override; 69 const gfx::Rect& requested_bounds) override;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 WindowSet windows_; 137 WindowSet windows_;
138 138
139 // The work area in the coordinates of |window_|. 139 // The work area in the coordinates of |window_|.
140 gfx::Rect work_area_in_parent_; 140 gfx::Rect work_area_in_parent_;
141 141
142 // True if this workspace is currently in fullscreen mode. 142 // True if this workspace is currently in fullscreen mode.
143 bool is_fullscreen_; 143 bool is_fullscreen_;
144 144
145 // A window which covers the full container and which gets inserted behind the 145 // A window which covers the full container and which gets inserted behind the
146 // topmost visible window. 146 // topmost visible window.
147 scoped_ptr<WorkspaceLayoutManagerDelegate> backdrop_delegate_; 147 std::unique_ptr<WorkspaceLayoutManagerDelegate> backdrop_delegate_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager); 149 DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
150 }; 150 };
151 151
152 } // namespace ash 152 } // namespace ash
153 153
154 #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ 154 #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_event_handler_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698