| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 void OnPinnedStateChanged(WmWindow* pinned_window) override; | 157 void OnPinnedStateChanged(WmWindow* pinned_window) override; |
| 158 | 158 |
| 159 // Overriden from aura::client::ActivationChangeObserver: | 159 // Overriden from aura::client::ActivationChangeObserver: |
| 160 void OnWindowActivated( | 160 void OnWindowActivated( |
| 161 aura::client::ActivationChangeObserver::ActivationReason reason, | 161 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 162 aura::Window* gained_active, | 162 aura::Window* gained_active, |
| 163 aura::Window* lost_active) override; | 163 aura::Window* lost_active) override; |
| 164 | 164 |
| 165 // Overridden from keyboard::KeyboardControllerObserver: | 165 // Overridden from keyboard::KeyboardControllerObserver: |
| 166 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; | 166 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
| 167 void OnKeyboardClosed() override {} |
| 167 | 168 |
| 168 // Overridden from ash::LockStateObserver: | 169 // Overridden from ash::LockStateObserver: |
| 169 void OnLockStateEvent(LockStateObserver::EventType event) override; | 170 void OnLockStateEvent(LockStateObserver::EventType event) override; |
| 170 | 171 |
| 171 // Overridden from ash::SessionStateObserver: | 172 // Overridden from ash::SessionStateObserver: |
| 172 void SessionStateChanged(SessionStateDelegate::SessionState state) override; | 173 void SessionStateChanged(SessionStateDelegate::SessionState state) override; |
| 173 | 174 |
| 174 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. | 175 // TODO(msw): Remove these accessors, kept temporarily to simplify changes. |
| 175 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); } | 176 ShelfAlignment GetAlignment() const { return shelf_widget_->GetAlignment(); } |
| 176 | 177 |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 | 395 |
| 395 std::unique_ptr<RootWindowControllerObserverImpl> | 396 std::unique_ptr<RootWindowControllerObserverImpl> |
| 396 root_window_controller_observer_; | 397 root_window_controller_observer_; |
| 397 | 398 |
| 398 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); | 399 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); |
| 399 }; | 400 }; |
| 400 | 401 |
| 401 } // namespace ash | 402 } // namespace ash |
| 402 | 403 |
| 403 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ | 404 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ |
| OLD | NEW |