ash/system/chromeos/session/logout_button_tray.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/session/logout_button_tray.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/screen_security/screen_tray_item.cc ('k') | ash/system/chromeos/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/session/logout_button_tray.cc

diff --git a/ash/system/chromeos/session/logout_button_tray.cc b/ash/system/chromeos/session/logout_button_tray.cc

index da9bfe88f4f8668760bba89e86e5d22eef3a7351..78f7d154546dca44b7ca16247a7bf1c8518c3513 100644

--- a/ash/system/chromeos/session/logout_button_tray.cc

+++ b/ash/system/chromeos/session/logout_button_tray.cc

@@ -9,11 +9,11 @@

#include "ash/common/shelf/shelf_types.h"

#include "ash/common/system/tray/system_tray_delegate.h"

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

#include "ash/shell.h"

#include "ash/system/chromeos/session/logout_confirmation_controller.h"

#include "ash/system/status_area_widget.h"

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

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

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

#include "base/logging.h"

#include "grit/ash_resources.h"