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

Side by Side Diff: ash/wm/panels/panel_layout_manager.h

Issue 844763006: Change overview mode to so that docked panel windows are not grouped together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved restore window animation out of the ScopedTransformOverviewWindow destructor. Created 5 years, 11 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_PANELS_PANEL_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void OnWindowRemovedFromLayout(aura::Window* child) override; 88 void OnWindowRemovedFromLayout(aura::Window* child) override;
89 void OnChildWindowVisibilityChanged(aura::Window* child, 89 void OnChildWindowVisibilityChanged(aura::Window* child,
90 bool visibile) override; 90 bool visibile) override;
91 void SetChildBounds(aura::Window* child, 91 void SetChildBounds(aura::Window* child,
92 const gfx::Rect& requested_bounds) override; 92 const gfx::Rect& requested_bounds) override;
93 93
94 // Overridden from ShelfIconObserver 94 // Overridden from ShelfIconObserver
95 void OnShelfIconPositionsChanged() override; 95 void OnShelfIconPositionsChanged() override;
96 96
97 // Overridden from ShellObserver 97 // Overridden from ShellObserver
98 void OnOverviewModeStarting() override;
99 void OnOverviewModeEnding() override;
98 void OnShelfAlignmentChanged(aura::Window* root_window) override; 100 void OnShelfAlignmentChanged(aura::Window* root_window) override;
99 101
100 // Overridden from aura::WindowObserver 102 // Overridden from aura::WindowObserver
101 void OnWindowPropertyChanged(aura::Window* window, 103 void OnWindowPropertyChanged(aura::Window* window,
102 const void* key, 104 const void* key,
103 intptr_t old) override; 105 intptr_t old) override;
104 106
105 // Overridden from ash::wm::WindowStateObserver 107 // Overridden from ash::wm::WindowStateObserver
106 void OnPostWindowStateTypeChange(wm::WindowState* window_state, 108 void OnPostWindowStateTypeChange(wm::WindowState* window_state,
107 wm::WindowStateType old_type) override; 109 wm::WindowStateType old_type) override;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 // When not NULL, the shelf is hidden (i.e. full screen) and this tracks the 186 // When not NULL, the shelf is hidden (i.e. full screen) and this tracks the
185 // set of panel windows which have been temporarily hidden and need to be 187 // set of panel windows which have been temporarily hidden and need to be
186 // restored when the shelf becomes visible again. 188 // restored when the shelf becomes visible again.
187 scoped_ptr<aura::WindowTracker> restore_windows_on_shelf_visible_; 189 scoped_ptr<aura::WindowTracker> restore_windows_on_shelf_visible_;
188 190
189 // The last active panel. Used to maintain stacking order even if no panels 191 // The last active panel. Used to maintain stacking order even if no panels
190 // are currently focused. 192 // are currently focused.
191 aura::Window* last_active_panel_; 193 aura::Window* last_active_panel_;
192 base::WeakPtrFactory<PanelLayoutManager> weak_factory_; 194 base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
193 195
196 // Track whether overview mode is active. Used to suppress layouts when it is.
197 bool overview_mode_active_;
198
194 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager); 199 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
195 }; 200 };
196 201
197 } // namespace ash 202 } // namespace ash
198 203
199 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 204 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698