ash/system/tray/system_tray.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/tray/system_tray.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/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index fccdae7ff79a1eb6a32783461bdc4bc217c7adaa..3bad616451a3b74def00d0a3401e1984d6802211 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -8,12 +8,15 @@

#include <map>

#include <vector>

-#include "ash/key_event_watcher.h"

-#include "ash/login_status.h"

-#include "ash/material_design/material_design_controller.h"

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

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

+#include "ash/common/material_design/material_design_controller.h"

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

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

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

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

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/root_window_controller.h"

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

#include "ash/shelf/wm_shelf.h"

#include "ash/shelf/wm_shelf_util.h"

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

@@ -48,9 +51,6 @@

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

#include "ash/system/web_notification/web_notification_tray.h"

#include "ash/wm/container_finder.h"

-#include "ash/wm_activation_observer.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/logging.h"

#include "base/memory/ptr_util.h"

#include "base/metrics/histogram_macros.h"

« no previous file with comments | « ash/system/tray/system_menu_button.cc ('k') | ash/system/tray/system_tray_bubble.h » ('j') | no next file with comments »