| 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/focus_cycler.h" | 10 #include "ash/focus_cycler.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 return shelf_widget ? shelf_widget->shelf() : NULL; | 68 return shelf_widget ? shelf_widget->shelf() : NULL; |
| 69 } | 69 } |
| 70 | 70 |
| 71 void Shelf::SetAlignment(ShelfAlignment alignment) { | 71 void Shelf::SetAlignment(ShelfAlignment alignment) { |
| 72 alignment_ = alignment; | 72 alignment_ = alignment; |
| 73 shelf_view_->OnShelfAlignmentChanged(); | 73 shelf_view_->OnShelfAlignmentChanged(); |
| 74 // ShelfLayoutManager will resize the shelf. | 74 // ShelfLayoutManager will resize the shelf. |
| 75 } | 75 } |
| 76 | 76 |
| 77 bool Shelf::IsHorizontalAlignment() const { | 77 bool Shelf::IsHorizontalAlignment() const { |
| 78 return alignment_ == SHELF_ALIGNMENT_BOTTOM || | 78 return alignment_ == SHELF_ALIGNMENT_BOTTOM; |
| 79 alignment_ == SHELF_ALIGNMENT_TOP; | |
| 80 } | 79 } |
| 81 | 80 |
| 82 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) { | 81 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) { |
| 83 shelf_widget_->shelf_layout_manager()->SetAutoHideBehavior(behavior); | 82 shelf_widget_->shelf_layout_manager()->SetAutoHideBehavior(behavior); |
| 84 } | 83 } |
| 85 | 84 |
| 86 ShelfAutoHideBehavior Shelf::GetAutoHideBehavior() const { | 85 ShelfAutoHideBehavior Shelf::GetAutoHideBehavior() const { |
| 87 return shelf_widget_->shelf_layout_manager()->auto_hide_behavior(); | 86 return shelf_widget_->shelf_layout_manager()->auto_hide_behavior(); |
| 88 } | 87 } |
| 89 | 88 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 | 186 |
| 188 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { | 187 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { |
| 189 return shelf_view_->GetVisibleItemsBoundsInScreen(); | 188 return shelf_view_->GetVisibleItemsBoundsInScreen(); |
| 190 } | 189 } |
| 191 | 190 |
| 192 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { | 191 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { |
| 193 return shelf_view_; | 192 return shelf_view_; |
| 194 } | 193 } |
| 195 | 194 |
| 196 } // namespace ash | 195 } // namespace ash |
| OLD | NEW |