ash/system/tray/tray_image_item.cc - Issue 2030593002: Renames ash/wm/common into ash/common/wm

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »

OLD	NEW
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/common/wm/shelf/wm_shelf_util.h"

7 #include "ash/shelf/shelf_util.h"	8 #include "ash/shelf/shelf_util.h"

8 #include "ash/system/tray/system_tray.h"	9 #include "ash/system/tray/system_tray.h"

9 #include "ash/system/tray/tray_item_view.h"	10 #include "ash/system/tray/tray_item_view.h"

10 #include "ash/system/tray/tray_utils.h"	11 #include "ash/system/tray/tray_utils.h"

11 #include "ash/wm/common/shelf/wm_shelf_util.h"

12 #include "ui/base/resource/resource_bundle.h"	12 #include "ui/base/resource/resource_bundle.h"

13 #include "ui/gfx/image/image.h"	13 #include "ui/gfx/image/image.h"

14 #include "ui/views/controls/image_view.h"	14 #include "ui/views/controls/image_view.h"

15 #include "ui/views/layout/box_layout.h"	15 #include "ui/views/layout/box_layout.h"

16	16

17 namespace ash {	17 namespace ash {

18	18

19 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id)	19 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id)

20 : SystemTrayItem(system_tray),	20 : SystemTrayItem(system_tray),

21 resource_id_(resource_id),	21 resource_id_(resource_id),

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 void TrayImageItem::SetItemAlignment(wm::ShelfAlignment alignment) {	77 void TrayImageItem::SetItemAlignment(wm::ShelfAlignment alignment) {

78 // Center the item dependent on the orientation of the shelf.	78 // Center the item dependent on the orientation of the shelf.

79 views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment)	79 views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment)

80 ? views::BoxLayout::kHorizontal	80 ? views::BoxLayout::kHorizontal

81 : views::BoxLayout::kVertical;	81 : views::BoxLayout::kVertical;

82 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));	82 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));

83 tray_view_->Layout();	83 tray_view_->Layout();

84 }	84 }

85	85

86 } // namespace ash	86 } // namespace ash

OLD	NEW