ash/system/tray/tray_image_item.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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_event_filter.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/shelf/wm_shelf_util.h"

8 #include "ash/resources/vector_icons/vector_icons.h"	7 #include "ash/resources/vector_icons/vector_icons.h"

	8 #include "ash/shelf/wm_shelf_util.h"

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

10 #include "ash/system/tray/tray_constants.h"	10 #include "ash/system/tray/tray_constants.h"

11 #include "ash/system/tray/tray_item_view.h"	11 #include "ash/system/tray/tray_item_view.h"

12 #include "ash/system/tray/tray_utils.h"	12 #include "ash/system/tray/tray_utils.h"

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

14 #include "ui/gfx/paint_vector_icon.h"	14 #include "ui/gfx/paint_vector_icon.h"

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

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

17	17

18 namespace ash {	18 namespace ash {

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69	69

70 void TrayImageItem::UpdateImageOnImageView() {	70 void TrayImageItem::UpdateImageOnImageView() {

71 if (!tray_view_)	71 if (!tray_view_)

72 return;	72 return;

73	73

74 tray_view_->image_view()->SetImage(	74 tray_view_->image_view()->SetImage(

75 gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_));	75 gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_));

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW