| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shelf/shelf.h" | 5 #include "ash/shelf/shelf.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| 11 #include "ash/common/wm/shelf/wm_shelf_util.h" | 11 #include "ash/common/wm/shelf/wm_shelf_util.h" |
| 12 #include "ash/focus_cycler.h" | 12 #include "ash/focus_cycler.h" |
| 13 #include "ash/root_window_controller.h" | 13 #include "ash/root_window_controller.h" |
| 14 #include "ash/root_window_settings.h" |
| 14 #include "ash/screen_util.h" | 15 #include "ash/screen_util.h" |
| 15 #include "ash/shelf/shelf_delegate.h" | 16 #include "ash/shelf/shelf_delegate.h" |
| 16 #include "ash/shelf/shelf_item_delegate.h" | 17 #include "ash/shelf/shelf_item_delegate.h" |
| 17 #include "ash/shelf/shelf_item_delegate_manager.h" | 18 #include "ash/shelf/shelf_item_delegate_manager.h" |
| 18 #include "ash/shelf/shelf_layout_manager.h" | 19 #include "ash/shelf/shelf_layout_manager.h" |
| 19 #include "ash/shelf/shelf_model.h" | 20 #include "ash/shelf/shelf_model.h" |
| 20 #include "ash/shelf/shelf_navigator.h" | 21 #include "ash/shelf/shelf_navigator.h" |
| 21 #include "ash/shelf/shelf_util.h" | 22 #include "ash/shelf/shelf_util.h" |
| 22 #include "ash/shelf/shelf_view.h" | 23 #include "ash/shelf/shelf_view.h" |
| 23 #include "ash/shell.h" | 24 #include "ash/shell.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 return Shelf::ForWindow(Shell::GetPrimaryRootWindow()); | 66 return Shelf::ForWindow(Shell::GetPrimaryRootWindow()); |
| 66 } | 67 } |
| 67 | 68 |
| 68 // static | 69 // static |
| 69 Shelf* Shelf::ForWindow(const aura::Window* window) { | 70 Shelf* Shelf::ForWindow(const aura::Window* window) { |
| 70 ShelfWidget* shelf_widget = | 71 ShelfWidget* shelf_widget = |
| 71 RootWindowController::ForWindow(window)->shelf_widget(); | 72 RootWindowController::ForWindow(window)->shelf_widget(); |
| 72 return shelf_widget ? shelf_widget->shelf() : nullptr; | 73 return shelf_widget ? shelf_widget->shelf() : nullptr; |
| 73 } | 74 } |
| 74 | 75 |
| 76 // static |
| 77 Shelf* Shelf::ForDisplayId(int64_t display_id) { |
| 78 for (aura::Window* window : Shell::GetInstance()->GetAllRootWindows()) { |
| 79 RootWindowSettings* settings = GetRootWindowSettings(window); |
| 80 if (settings->display_id == display_id && settings->controller) { |
| 81 ShelfWidget* shelf_widget = settings->controller->shelf_widget(); |
| 82 return shelf_widget ? shelf_widget->shelf() : nullptr; |
| 83 } |
| 84 } |
| 85 return nullptr; |
| 86 } |
| 87 |
| 75 void Shelf::SetAlignment(wm::ShelfAlignment alignment) { | 88 void Shelf::SetAlignment(wm::ShelfAlignment alignment) { |
| 76 if (alignment_ == alignment) | 89 if (alignment_ == alignment) |
| 77 return; | 90 return; |
| 78 | 91 |
| 79 if (shelf_locking_manager_.is_locked() && | 92 if (shelf_locking_manager_.is_locked() && |
| 80 alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) { | 93 alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
| 81 shelf_locking_manager_.set_stored_alignment(alignment); | 94 shelf_locking_manager_.set_stored_alignment(alignment); |
| 82 return; | 95 return; |
| 83 } | 96 } |
| 84 | 97 |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 | 226 |
| 214 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { | 227 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { |
| 215 return shelf_view_->GetVisibleItemsBoundsInScreen(); | 228 return shelf_view_->GetVisibleItemsBoundsInScreen(); |
| 216 } | 229 } |
| 217 | 230 |
| 218 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { | 231 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { |
| 219 return shelf_view_; | 232 return shelf_view_; |
| 220 } | 233 } |
| 221 | 234 |
| 222 } // namespace ash | 235 } // namespace ash |
| OLD | NEW |