ash/system/user/button_from_view.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/user/button_from_view.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

« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 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/user/button_from_view.h"	5 #include "ash/system/user/button_from_view.h"

6	6

7 #include "ash/ash_constants.h"	7 #include "ash/ash_constants.h"

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

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

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "ui/accessibility/ax_view_state.h"	12 #include "ui/accessibility/ax_view_state.h"

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

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

15 #include "ui/views/border.h"	15 #include "ui/views/border.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 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 button_hovered_ ? kHoverBackgroundColor : kBackgroundColor;	102 button_hovered_ ? kHoverBackgroundColor : kBackgroundColor;

103 content_->set_background(	103 content_->set_background(

104 views::Background::CreateSolidBackground(background_color));	104 views::Background::CreateSolidBackground(background_color));

105 set_background(views::Background::CreateSolidBackground(background_color));	105 set_background(views::Background::CreateSolidBackground(background_color));

106 }	106 }

107 SchedulePaint();	107 SchedulePaint();

108 }	108 }

109	109

110 } // namespace tray	110 } // namespace tray

111 } // namespace ash	111 } // namespace ash

OLD	NEW