ash/system/user/user_card_view.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces 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/user/user_card_view.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

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/user/user_card_view.cc

diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc

index a0eaeebab54ebd99a6f0109e79901e53cffdfdbd..7a07c9a8b93730fbf126cea969a3d43b1f79c8be 100644

--- a/ash/system/user/user_card_view.cc

+++ b/ash/system/user/user_card_view.cc

@@ -7,7 +7,7 @@

#include <algorithm>

#include <vector>

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

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

#include "ash/shell.h"

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

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

@@ -39,7 +39,7 @@

#if defined(OS_CHROMEOS)

#include "ash/ash_view_ids.h"

-#include "ash/media_delegate.h"

+#include "ash/common/media_delegate.h"

#include "ash/system/tray/media_security/media_capture_observer.h"

#include "ui/views/controls/image_view.h"

#include "ui/views/layout/fill_layout.h"

« ash/common/session/session_state_delegate.h ('K') | « ash/system/user/tray_user_separator.cc ('k') | ash/system/user/user_view.h » ('j') | no next file with comments »