| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_SHELF_SHELF_LAYOUT_MANAGER_H_ | 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ | 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 | 328 |
| 329 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from | 329 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from |
| 330 // our destructor. We avoid that as at the time we're deleted Shell is being | 330 // our destructor. We avoid that as at the time we're deleted Shell is being |
| 331 // deleted too. | 331 // deleted too. |
| 332 aura::Window* root_window_; | 332 aura::Window* root_window_; |
| 333 | 333 |
| 334 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling | 334 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling |
| 335 // UpdateBoundsAndOpacity() again from SetChildBounds(). | 335 // UpdateBoundsAndOpacity() again from SetChildBounds(). |
| 336 bool updating_bounds_; | 336 bool updating_bounds_; |
| 337 | 337 |
| 338 bool in_shutdown_ = false; |
| 339 |
| 338 // Current state. | 340 // Current state. |
| 339 State state_; | 341 State state_; |
| 340 | 342 |
| 341 ShelfWidget* shelf_; | 343 ShelfWidget* shelf_; |
| 342 | 344 |
| 343 WorkspaceController* workspace_controller_; | 345 WorkspaceController* workspace_controller_; |
| 344 | 346 |
| 345 // Do any windows overlap the shelf? This is maintained by WorkspaceManager. | 347 // Do any windows overlap the shelf? This is maintained by WorkspaceManager. |
| 346 bool window_overlaps_shelf_; | 348 bool window_overlaps_shelf_; |
| 347 | 349 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 | 403 |
| 402 std::unique_ptr<RootWindowControllerObserverImpl> | 404 std::unique_ptr<RootWindowControllerObserverImpl> |
| 403 root_window_controller_observer_; | 405 root_window_controller_observer_; |
| 404 | 406 |
| 405 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); | 407 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); |
| 406 }; | 408 }; |
| 407 | 409 |
| 408 } // namespace ash | 410 } // namespace ash |
| 409 | 411 |
| 410 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ | 412 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| OLD | NEW |