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

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

Unified Diff: ash/system/chromeos/label_tray_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/label_tray_view.cc

diff --git a/ash/system/chromeos/label_tray_view.cc b/ash/system/chromeos/label_tray_view.cc

index 5170360fee442a27a29ccbee76aee4eda26cc686..d4882205c49aa1afb9305a84b44b77a7f4c8278e 100644

--- a/ash/system/chromeos/label_tray_view.cc

+++ b/ash/system/chromeos/label_tray_view.cc

@@ -4,8 +4,8 @@

#include "ash/system/chromeos/label_tray_view.h"

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

#include "ash/system/tray/hover_highlight_view.h"

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

#include "ash/system/tray/view_click_listener.h"

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

#include "ui/gfx/font.h"