ash/system/chromeos/settings/tray_settings.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/settings/tray_settings.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

Index: ash/system/chromeos/settings/tray_settings.cc

diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc

index 9b8837621c754ce2a99c8cd72c15ce1ae64beed2..a0ca04d602b09c2d65bcb9c7783d2d263c02e685 100644

--- a/ash/system/chromeos/settings/tray_settings.cc

+++ b/ash/system/chromeos/settings/tray_settings.cc

@@ -5,13 +5,13 @@

#include "ash/system/chromeos/settings/tray_settings.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/system/tray/fixed_sized_image_view.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/power/power_status.h"

#include "ash/system/chromeos/power/power_status_view.h"

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

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

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

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"

#include "grit/ash_resources.h"

« no previous file with comments | « ash/system/chromeos/session/logout_confirmation_dialog.cc ('k') | ash/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »