| 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_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| 6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ | 6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 void OnLockStateChanged(bool locked) override; | 136 void OnLockStateChanged(bool locked) override; |
| 137 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override; | 137 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override; |
| 138 void OnPinnedStateChanged(WmWindow* pinned_window) override; | 138 void OnPinnedStateChanged(WmWindow* pinned_window) override; |
| 139 | 139 |
| 140 // Overridden from WmActivationObserver: | 140 // Overridden from WmActivationObserver: |
| 141 void OnWindowActivated(WmWindow* gained_active, | 141 void OnWindowActivated(WmWindow* gained_active, |
| 142 WmWindow* lost_active) override; | 142 WmWindow* lost_active) override; |
| 143 | 143 |
| 144 // Overridden from keyboard::KeyboardControllerObserver: | 144 // Overridden from keyboard::KeyboardControllerObserver: |
| 145 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; | 145 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
| 146 void OnKeyboardHidden() override; |
| 146 | 147 |
| 147 // Overridden from LockStateObserver: | 148 // Overridden from LockStateObserver: |
| 148 void OnLockStateEvent(LockStateObserver::EventType event) override; | 149 void OnLockStateEvent(LockStateObserver::EventType event) override; |
| 149 | 150 |
| 150 // Overridden from SessionStateObserver: | 151 // Overridden from SessionStateObserver: |
| 151 void SessionStateChanged(SessionStateDelegate::SessionState state) override; | 152 void SessionStateChanged(SessionStateDelegate::SessionState state) override; |
| 152 | 153 |
| 153 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. | 154 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. |
| 154 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); } | 155 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); } |
| 155 | 156 |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 // The flag to enforce invisible shelf (as in MD-experiemntal). | 371 // The flag to enforce invisible shelf (as in MD-experiemntal). |
| 371 // TODO(oshima): Remove this when MD immersive is launched. | 372 // TODO(oshima): Remove this when MD immersive is launched. |
| 372 bool invisible_auto_hide_shelf_ = false; | 373 bool invisible_auto_hide_shelf_ = false; |
| 373 | 374 |
| 374 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); | 375 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); |
| 375 }; | 376 }; |
| 376 | 377 |
| 377 } // namespace ash | 378 } // namespace ash |
| 378 | 379 |
| 379 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ | 380 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| OLD | NEW |