ash/system/user/user_view.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/user/user_view.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/user/user_view.cc

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

index a62f24e7060eebc956afffc4954196b77b71df56..8ea6d45c81c4f4556ded5ee0ce472bb7a16c57d4 100644

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

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

@@ -10,6 +10,8 @@

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

#include "ash/common/shell_window_ids.h"

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

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

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

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

@@ -19,8 +21,6 @@

#include "ash/shell.h"

#include "ash/shell_delegate.h"

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

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

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

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

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

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

« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | chrome/browser/chromeos/shutdown_policy_browsertest.cc » ('j') | no next file with comments »