ash/system/tray/tray_popup_item_container.cc - Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common

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

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (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

OLD	NEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2014 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_popup_item_container.h"	5 #include "ash/system/tray/tray_popup_item_container.h"

6	6

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

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "ui/base/ui_base_switches_util.h"	9 #include "ui/base/ui_base_switches_util.h"

10 #include "ui/gfx/canvas.h"	10 #include "ui/gfx/canvas.h"

11 #include "ui/views/border.h"	11 #include "ui/views/border.h"

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

13	13

14 namespace ash {	14 namespace ash {

15	15

16 TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,	16 TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,

17 bool change_background,	17 bool change_background,

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 return;	80 return;

81	81

82 views::View* view = child_at(0);	82 views::View* view = child_at(0);

83 if (!view->background()) {	83 if (!view->background()) {

84 canvas->FillRect(gfx::Rect(size()), (active_) ? kHoverBackgroundColor	84 canvas->FillRect(gfx::Rect(size()), (active_) ? kHoverBackgroundColor

85 : kBackgroundColor);	85 : kBackgroundColor);

86 }	86 }

87 }	87 }

88	88

89 } // namespace ash	89 } // namespace ash

OLD	NEW

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