ash/system/user/user_card_view.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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:

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 1458b21976dcb700e0f101a526687af01e1720c3..ddc8c728093ca5ebcd2795e4da8fabde228efab4 100644

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

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

@@ -8,18 +8,18 @@

#include <memory>

#include <vector>

-#include "ash/ash_view_ids.h"

-#include "ash/login_status.h"

-#include "ash/media_controller.h"

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

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

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

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

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

#include "ash/resources/vector_icons/vector_icons.h"

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

#include "ash/strings/grit/ash_strings.h"

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

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

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

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

#include "ash/system/user/rounded_image_view.h"

-#include "ash/wm_shell.h"

#include "base/i18n/rtl.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

« no previous file with comments | « ash/system/user/user_card_view.h ('k') | ash/system/user/user_view.cc » ('j') | no next file with comments »