ash/shelf/shelf_layout_manager.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_layout_manager.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_layout_manager.cc

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

index c09ab66d37e1d2bc0628be3f4f4d0e0c1ba011a4..e3acb427e885b9f160978ac4a0904343d6feb2b0 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -13,6 +13,7 @@

#include "ash/accelerators/accelerator_commands.h"

#include "ash/ash_switches.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/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

@@ -22,7 +23,6 @@

#include "ash/common/wm_root_window_controller_observer.h"

#include "ash/root_window_controller.h"

#include "ash/screen_util.h"

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

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_bezel_event_filter.h"

#include "ash/shelf/shelf_delegate.h"

@@ -39,7 +39,6 @@

#include "ash/wm/workspace_controller.h"

#include "base/auto_reset.h"

#include "base/command_line.h"

-#include "base/command_line.h"

#include "base/i18n/rtl.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »