chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 2731873002: Revert "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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 8ece5852d70e8414f758b3d2a72cfcaa9e3fb0f1..722d71a8d2a985bd783f28a3171dd6206149a191 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -15,16 +15,16 @@

#include "ash/common/login_status.h"

#include "ash/common/shell_delegate.h"

+#include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"

+#include "ash/common/system/chromeos/power/power_status.h"

+#include "ash/common/system/chromeos/session/logout_button_observer.h"

+#include "ash/common/system/date/clock_observer.h"

+#include "ash/common/system/ime/ime_observer.h"

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

+#include "ash/common/system/tray_accessibility.h"

+#include "ash/common/system/user/user_observer.h"

#include "ash/common/wm_shell.h"

-#include "ash/system/bluetooth/bluetooth_observer.h"

-#include "ash/system/date/clock_observer.h"

-#include "ash/system/ime/ime_observer.h"

-#include "ash/system/power/power_status.h"

-#include "ash/system/rotation/tray_rotation_lock.h"

-#include "ash/system/session/logout_button_observer.h"

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

-#include "ash/system/tray_accessibility.h"

-#include "ash/system/user/user_observer.h"

+#include "ash/system/chromeos/rotation/tray_rotation_lock.h"

#include "base/bind_helpers.h"

#include "base/callback.h"

#include "base/logging.h"