ash/shelf/shelf_widget.cc - Issue 2041233004: mash: Move //ash/session to //ash/common/session

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/shelf/shelf_widget.cc

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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:

Index: ash/shelf/shelf_widget.cc

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc

index 8747f22797e7191e2c0bdedd77d87f68a155f3af..d5b8d7a8be8a760a5b80fd0f2fd923bf10e817d5 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

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

#include "ash/ash_switches.h"

#include "ash/aura/wm_shelf_aura.h"

#include "ash/aura/wm_window_aura.h"

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

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

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

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

#include "ash/common/shell_window_ids.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/focus_cycler.h"

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

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_navigator.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"

-#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

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

#include "ash/wm/status_area_layout_manager.h"

« no previous file with comments | « ash/shelf/shelf_locking_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »