| 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/system/chromeos/screen_security/screen_tray_item.h" | 5 #include "ash/system/chromeos/screen_security/screen_tray_item.h" |
| 6 | 6 |
| 7 #include "ash/shelf/shelf_util.h" | 7 #include "ash/shelf/shelf_util.h" |
| 8 #include "ash/system/tray/fixed_sized_image_view.h" | 8 #include "ash/system/tray/fixed_sized_image_view.h" |
| 9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
| 10 #include "ash/wm/common/shelf/wm_shelf_util.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/message_center/message_center.h" | 12 #include "ui/message_center/message_center.h" |
| 12 #include "ui/views/controls/label.h" | 13 #include "ui/views/controls/label.h" |
| 13 #include "ui/views/layout/box_layout.h" | 14 #include "ui/views/layout/box_layout.h" |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 const int kStopButtonRightPadding = 18; | 17 const int kStopButtonRightPadding = 18; |
| 17 } // namespace | 18 } // namespace |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 void ScreenTrayItem::DestroyDefaultView() { | 183 void ScreenTrayItem::DestroyDefaultView() { |
| 183 default_view_ = NULL; | 184 default_view_ = NULL; |
| 184 } | 185 } |
| 185 | 186 |
| 186 void ScreenTrayItem::UpdateAfterShelfAlignmentChange( | 187 void ScreenTrayItem::UpdateAfterShelfAlignmentChange( |
| 187 wm::ShelfAlignment alignment) { | 188 wm::ShelfAlignment alignment) { |
| 188 if (!tray_view_) | 189 if (!tray_view_) |
| 189 return; | 190 return; |
| 190 | 191 |
| 191 // Center the item dependent on the orientation of the shelf. | 192 // Center the item dependent on the orientation of the shelf. |
| 192 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) | 193 views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment) |
| 193 ? views::BoxLayout::kHorizontal | 194 ? views::BoxLayout::kHorizontal |
| 194 : views::BoxLayout::kVertical; | 195 : views::BoxLayout::kVertical; |
| 195 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); | 196 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); |
| 196 tray_view_->Layout(); | 197 tray_view_->Layout(); |
| 197 } | 198 } |
| 198 | 199 |
| 199 } // namespace ash | 200 } // namespace ash |
| OLD | NEW |