| 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 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "ash/launcher/launcher.h" | 10 #include "ash/launcher/launcher.h" |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 return AUTO_HIDE_HIDDEN; | 813 return AUTO_HIDE_HIDDEN; |
| 814 | 814 |
| 815 if (gesture_drag_status_ == GESTURE_DRAG_COMPLETE_IN_PROGRESS) | 815 if (gesture_drag_status_ == GESTURE_DRAG_COMPLETE_IN_PROGRESS) |
| 816 return gesture_drag_auto_hide_state_; | 816 return gesture_drag_auto_hide_state_; |
| 817 | 817 |
| 818 Shell* shell = Shell::GetInstance(); | 818 Shell* shell = Shell::GetInstance(); |
| 819 if (shell->GetAppListTargetVisibility()) | 819 if (shell->GetAppListTargetVisibility()) |
| 820 return AUTO_HIDE_SHOWN; | 820 return AUTO_HIDE_SHOWN; |
| 821 | 821 |
| 822 if (shell->status_area_widget() && | 822 if (shell->status_area_widget() && |
| 823 shell->status_area_widget()->should_show_launcher()) | 823 shell->status_area_widget()->ShouldShowLauncher()) |
| 824 return AUTO_HIDE_SHOWN; | 824 return AUTO_HIDE_SHOWN; |
| 825 | 825 |
| 826 if (launcher_ && launcher_->IsShowingMenu()) | 826 if (launcher_ && launcher_->IsShowingMenu()) |
| 827 return AUTO_HIDE_SHOWN; | 827 return AUTO_HIDE_SHOWN; |
| 828 | 828 |
| 829 if (launcher_ && launcher_->IsShowingOverflowBubble()) | 829 if (launcher_ && launcher_->IsShowingOverflowBubble()) |
| 830 return AUTO_HIDE_SHOWN; | 830 return AUTO_HIDE_SHOWN; |
| 831 | 831 |
| 832 if (launcher_widget()->IsActive() || status_->IsActive()) | 832 if (launcher_widget()->IsActive() || status_->IsActive()) |
| 833 return AUTO_HIDE_SHOWN; | 833 return AUTO_HIDE_SHOWN; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { | 879 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { |
| 880 if (state.visibility_state == VISIBLE) | 880 if (state.visibility_state == VISIBLE) |
| 881 return size; | 881 return size; |
| 882 if (state.visibility_state == AUTO_HIDE) | 882 if (state.visibility_state == AUTO_HIDE) |
| 883 return kAutoHideSize; | 883 return kAutoHideSize; |
| 884 return 0; | 884 return 0; |
| 885 } | 885 } |
| 886 | 886 |
| 887 } // namespace internal | 887 } // namespace internal |
| 888 } // namespace ash | 888 } // namespace ash |
| OLD | NEW |