ash/system/tray/tray_notification_view.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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_notification_view.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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

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/common/system/tray/tray_notification_view.h"	5 #include "ash/system/tray/tray_notification_view.h"

6	6

7 #include "ash/common/system/tray/tray_constants.h"

8 #include "ash/resources/grit/ash_resources.h"	7 #include "ash/resources/grit/ash_resources.h"

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

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

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

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

12 #include "ui/resources/grit/ui_resources.h"	12 #include "ui/resources/grit/ui_resources.h"

13 #include "ui/views/background.h"	13 #include "ui/views/background.h"

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

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

16	16

17 namespace ash {	17 namespace ash {

18	18

19 namespace {	19 namespace {

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 // Layout rows	87 // Layout rows

88 layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);	88 layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);

89 layout->StartRow(0, 0);	89 layout->StartRow(0, 0);

90 layout->AddView(icon_);	90 layout->AddView(icon_);

91 layout->AddView(contents);	91 layout->AddView(contents);

92 layout->AddView(close_button);	92 layout->AddView(close_button);

93 layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);	93 layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);

94 }	94 }

95	95

96 } // namespace ash	96 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/tray/tray_notification_view.h ('k') | ash/system/tray/tray_popup_header_button.h » ('j') | no next file with comments »