ash/system/chromeos/tray_display.cc - Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray

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/tray_display.cc

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove

Patch Set: rebase 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/tray_display.cc

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

index 58613d094c71abfe9b00ef075bee9f0d0b5ce855..9462d5137627fa778d8e4e925b27080094aba581 100644

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

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

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

#include <utility>

#include <vector>

+#include "ash/common/system/tray/actionable_view.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/common/system/tray/tray_notification_view.h"

#include "ash/common/wm_shell.h"

#include "ash/display/display_manager.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

@@ -18,9 +20,7 @@

#include "ash/shell.h"

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

#include "ash/system/system_notifier.h"

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

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

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

#include "base/bind.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

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