ash/system/cast/tray_cast.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/cast/tray_cast.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/cast/tray_cast.cc

diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc

index 1d62e1e1725543db6c8ed1b51aa46e83a56931dc..cd66c20d0702d7d1a1d3b550753ac1f26c09b7a4 100644

--- a/ash/system/cast/tray_cast.cc

+++ b/ash/system/cast/tray_cast.cc

@@ -8,21 +8,21 @@

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

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

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

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

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

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

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

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

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

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

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

#include "ash/common/wm_shell.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shell.h"

#include "ash/system/chromeos/screen_security/screen_tray_item.h"

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

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

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

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

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

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

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

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

#include "base/bind.h"

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | ash/system/chromeos/audio/audio_detailed_view.h » ('j') | no next file with comments »