| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_WM_SHELF_H_ | 5 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_ |
| 6 #define ASH_COMMON_SHELF_WM_SHELF_H_ | 6 #define ASH_COMMON_SHELF_WM_SHELF_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 void ShutdownShelfWidget(); | 52 void ShutdownShelfWidget(); |
| 53 void DestroyShelfWidget(); | 53 void DestroyShelfWidget(); |
| 54 | 54 |
| 55 ShelfLayoutManager* shelf_layout_manager() const { | 55 ShelfLayoutManager* shelf_layout_manager() const { |
| 56 return shelf_layout_manager_; | 56 return shelf_layout_manager_; |
| 57 } | 57 } |
| 58 | 58 |
| 59 ShelfWidget* shelf_widget() { return shelf_widget_.get(); } | 59 ShelfWidget* shelf_widget() { return shelf_widget_.get(); } |
| 60 | 60 |
| 61 // Creates the shelf view. | 61 // Creates the shelf view. |
| 62 void InitializeShelf(); | 62 void CreateShelfView(); |
| 63 |
| 64 // TODO(jamescook): Eliminate this method. |
| 63 void ShutdownShelf(); | 65 void ShutdownShelf(); |
| 64 | 66 |
| 65 // True after the ShelfView has been created (e.g. after login). | 67 // True after the ShelfView has been created (e.g. after login). |
| 66 bool IsShelfInitialized() const; | 68 bool IsShelfInitialized() const; |
| 67 | 69 |
| 68 // Returns the window showing the shelf. | 70 // Returns the window showing the shelf. |
| 69 WmWindow* GetWindow(); | 71 WmWindow* GetWindow(); |
| 70 | 72 |
| 71 ShelfAlignment alignment() const { return alignment_; } | 73 ShelfAlignment alignment() const { return alignment_; } |
| 72 // TODO(jamescook): Replace with alignment(). | 74 // TODO(jamescook): Replace with alignment(). |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 // Forwards touch gestures on a bezel sensor to the shelf. | 183 // Forwards touch gestures on a bezel sensor to the shelf. |
| 182 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 | 184 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 |
| 183 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; | 185 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; |
| 184 | 186 |
| 185 DISALLOW_COPY_AND_ASSIGN(WmShelf); | 187 DISALLOW_COPY_AND_ASSIGN(WmShelf); |
| 186 }; | 188 }; |
| 187 | 189 |
| 188 } // namespace ash | 190 } // namespace ash |
| 189 | 191 |
| 190 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ | 192 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ |
| OLD | NEW |