ash/system/user/tray_user.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

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

diff --git a/ash/common/system/user/tray_user.cc b/ash/system/user/tray_user.cc

similarity index 94%

rename from ash/common/system/user/tray_user.cc

rename to ash/system/user/tray_user.cc

index 65379215aa98c15b956c319576d3be1e62ab305c..4ed4d386e1edd0c46ae120e16d2c3fac56749cbf 100644

--- a/ash/common/system/user/tray_user.cc

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

@@ -2,20 +2,20 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/common/system/user/tray_user.h"

+#include "ash/system/user/tray_user.h"

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

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

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

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

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

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

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

-#include "ash/common/system/tray/tray_utils.h"

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

-#include "ash/common/system/user/user_view.h"

#include "ash/common/wm_shell.h"

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

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

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

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

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

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

+#include "ash/system/tray/tray_utils.h"

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

+#include "ash/system/user/user_view.h"

#include "base/logging.h"

#include "base/strings/string16.h"

#include "components/signin/core/account_id/account_id.h"

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