| OLD | NEW |
| 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_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 "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/launcher/launcher.h" | 9 #include "ash/launcher/launcher.h" |
| 10 #include "ash/shelf/background_animator.h" | 10 #include "ash/shelf/background_animator.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 bool visible) OVERRIDE; | 157 bool visible) OVERRIDE; |
| 158 virtual void SetChildBounds(aura::Window* child, | 158 virtual void SetChildBounds(aura::Window* child, |
| 159 const gfx::Rect& requested_bounds) OVERRIDE; | 159 const gfx::Rect& requested_bounds) OVERRIDE; |
| 160 | 160 |
| 161 // Overridden from ash::ShellObserver: | 161 // Overridden from ash::ShellObserver: |
| 162 virtual void OnLockStateChanged(bool locked) OVERRIDE; | 162 virtual void OnLockStateChanged(bool locked) OVERRIDE; |
| 163 | 163 |
| 164 // Overriden from aura::client::ActivationChangeObserver: | 164 // Overriden from aura::client::ActivationChangeObserver: |
| 165 virtual void OnWindowActivated(aura::Window* gained_active, | 165 virtual void OnWindowActivated(aura::Window* gained_active, |
| 166 aura::Window* lost_active) OVERRIDE; | 166 aura::Window* lost_active) OVERRIDE; |
| 167 virtual void OnWindowActivationRequestCompleted( |
| 168 aura::Window* request_active, aura::Window* actual_active) OVERRIDE; |
| 167 | 169 |
| 168 // TODO(harrym|oshima): These templates will be moved to | 170 // TODO(harrym|oshima): These templates will be moved to |
| 169 // new Shelf class. | 171 // new Shelf class. |
| 170 // A helper function that provides a shortcut for choosing | 172 // A helper function that provides a shortcut for choosing |
| 171 // values specific to a shelf alignment. | 173 // values specific to a shelf alignment. |
| 172 template<typename T> | 174 template<typename T> |
| 173 T SelectValueForShelfAlignment(T bottom, T left, T right, T top) const { | 175 T SelectValueForShelfAlignment(T bottom, T left, T right, T top) const { |
| 174 switch (alignment_) { | 176 switch (alignment_) { |
| 175 case SHELF_ALIGNMENT_BOTTOM: | 177 case SHELF_ALIGNMENT_BOTTOM: |
| 176 return bottom; | 178 return bottom; |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 // Used to delay updating shelf background. | 332 // Used to delay updating shelf background. |
| 331 UpdateShelfObserver* update_shelf_observer_; | 333 UpdateShelfObserver* update_shelf_observer_; |
| 332 | 334 |
| 333 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); | 335 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); |
| 334 }; | 336 }; |
| 335 | 337 |
| 336 } // namespace internal | 338 } // namespace internal |
| 337 } // namespace ash | 339 } // namespace ash |
| 338 | 340 |
| 339 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ | 341 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| OLD | NEW |