Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Side by Side Diff: ash/system/tray/tray_image_item.cc

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tray/tray_image_item.h" 5 #include "ash/system/tray/tray_image_item.h"
6 6
7 #include "ash/shelf/shelf_util.h" 7 #include "ash/shelf/shelf_util.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/tray_item_view.h" 9 #include "ash/system/tray/tray_item_view.h"
10 #include "ash/system/tray/tray_utils.h" 10 #include "ash/system/tray/tray_utils.h"
11 #include "ash/wm/common/shelf/wm_shelf_util.h"
11 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/image/image.h" 13 #include "ui/gfx/image/image.h"
13 #include "ui/views/controls/image_view.h" 14 #include "ui/views/controls/image_view.h"
14 #include "ui/views/layout/box_layout.h" 15 #include "ui/views/layout/box_layout.h"
15 16
16 namespace ash { 17 namespace ash {
17 18
18 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) 19 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id)
19 : SystemTrayItem(system_tray), 20 : SystemTrayItem(system_tray),
20 resource_id_(resource_id), 21 resource_id_(resource_id),
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 69 }
69 70
70 void TrayImageItem::DestroyDefaultView() { 71 void TrayImageItem::DestroyDefaultView() {
71 } 72 }
72 73
73 void TrayImageItem::DestroyDetailedView() { 74 void TrayImageItem::DestroyDetailedView() {
74 } 75 }
75 76
76 void TrayImageItem::SetItemAlignment(wm::ShelfAlignment alignment) { 77 void TrayImageItem::SetItemAlignment(wm::ShelfAlignment alignment) {
77 // Center the item dependent on the orientation of the shelf. 78 // Center the item dependent on the orientation of the shelf.
78 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) 79 views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment)
79 ? views::BoxLayout::kHorizontal 80 ? views::BoxLayout::kHorizontal
80 : views::BoxLayout::kVertical; 81 : views::BoxLayout::kVertical;
81 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); 82 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
82 tray_view_->Layout(); 83 tray_view_->Layout();
83 } 84 }
84 85
85 } // namespace ash 86 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698