ash/system/tiles/tiles_default_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/tiles/tiles_default_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/tiles/tiles_default_view.cc

diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc

index cd3777e2f0ff9eba022bfcf90c45e224078d3047..d12e5ccf8730d9e4fdcdc8ace647ceecfba21227 100644

--- a/ash/system/tiles/tiles_default_view.cc

+++ b/ash/system/tiles/tiles_default_view.cc

@@ -4,11 +4,12 @@

#include "ash/system/tiles/tiles_default_view.h"

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

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

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

#include "ash/metrics/user_metrics_action.h"

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

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

#include "ash/shell.h"

-#include "ash/shutdown_controller.h"

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

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

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

@@ -18,7 +19,6 @@

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

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

#include "ash/wm/lock_state_controller.h"

-#include "ash/wm_shell.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "ui/base/l10n/l10n_util.h"

« no previous file with comments | « ash/system/tiles/tiles_default_view.h ('k') | ash/system/tiles/tray_tiles.cc » ('j') | no next file with comments »