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 #include "ash/wm/shelf_layout_manager.h" | 5 #include "ash/wm/shelf_layout_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/launcher/launcher.h" | 9 #include "ash/launcher/launcher.h" |
10 #include "ash/screen_ash.h" | 10 #include "ash/screen_ash.h" |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 } | 321 } |
322 | 322 |
323 void ShelfLayoutManager::OnWindowActivated(aura::Window* active, | 323 void ShelfLayoutManager::OnWindowActivated(aura::Window* active, |
324 aura::Window* old_active) { | 324 aura::Window* old_active) { |
325 UpdateAutoHideStateNow(); | 325 UpdateAutoHideStateNow(); |
326 } | 326 } |
327 | 327 |
328 //////////////////////////////////////////////////////////////////////////////// | 328 //////////////////////////////////////////////////////////////////////////////// |
329 // ShelfLayoutManager, private: | 329 // ShelfLayoutManager, private: |
330 | 330 |
| 331 ShelfLayoutManager::TargetBounds::TargetBounds() : opacity(0.0f) {} |
| 332 |
331 gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds( | 333 gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds( |
332 aura::Window* window) { | 334 aura::Window* window) { |
333 gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window)); | 335 gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window)); |
334 if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT || | 336 if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT || |
335 auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) { | 337 auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) { |
336 AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds); | 338 AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds); |
337 return bounds; | 339 return bounds; |
338 } | 340 } |
339 // SHELF_AUTO_HIDE_BEHAVIOR_NEVER maximized windows don't get any taller. | 341 // SHELF_AUTO_HIDE_BEHAVIOR_NEVER maximized windows don't get any taller. |
340 return GetUnmaximizedWorkAreaBounds(window); | 342 return GetUnmaximizedWorkAreaBounds(window); |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
600 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { | 602 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { |
601 if (state.visibility_state == VISIBLE) | 603 if (state.visibility_state == VISIBLE) |
602 return size; | 604 return size; |
603 if (state.visibility_state == AUTO_HIDE) | 605 if (state.visibility_state == AUTO_HIDE) |
604 return kAutoHideSize; | 606 return kAutoHideSize; |
605 return 0; | 607 return 0; |
606 } | 608 } |
607 | 609 |
608 } // namespace internal | 610 } // namespace internal |
609 } // namespace ash | 611 } // namespace ash |
OLD | NEW |