| 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 #include "ash/common/system/tray/tri_view.h" | 5 #include "ash/system/tray/tri_view.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/size_range_layout.h" | 7 #include "ash/system/tray/size_range_layout.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "ui/views/border.h" | 9 #include "ui/views/border.h" |
| 10 #include "ui/views/layout/box_layout.h" | 10 #include "ui/views/layout/box_layout.h" |
| 11 #include "ui/views/layout/fill_layout.h" | 11 #include "ui/views/layout/fill_layout.h" |
| 12 #include "ui/views/layout/layout_manager.h" | 12 #include "ui/views/layout/layout_manager.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // Converts TriView::Orientation values to views::BoxLayout::Orientation values. | 17 // Converts TriView::Orientation values to views::BoxLayout::Orientation values. |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 return center_container_layout_manager_; | 170 return center_container_layout_manager_; |
| 171 case Container::END: | 171 case Container::END: |
| 172 return end_container_layout_manager_; | 172 return end_container_layout_manager_; |
| 173 } | 173 } |
| 174 // Required for some compilers. | 174 // Required for some compilers. |
| 175 NOTREACHED(); | 175 NOTREACHED(); |
| 176 return nullptr; | 176 return nullptr; |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace ash | 179 } // namespace ash |
| OLD | NEW |