chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common

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/chrome_shell_delegate.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« ash/common/session/session_state_delegate.h ('K') | « chrome/browser/ui/ash/chrome_shell_content_state_chromeos.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

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

index 5d523cb8de7d5bd3ec2c0aaf6df863d933dbdb98..dd20ec8049a2e376e26b0e755bb64f5a12e66d4c 100644

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

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

@@ -8,12 +8,13 @@

#include "ash/accelerators/magnifier_key_scroller.h"

#include "ash/accelerators/spoken_feedback_toggler.h"

-#include "ash/accessibility_delegate.h"

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

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

#include "ash/common/wm/window_state.h"

#include "ash/container_delegate_aura.h"

#include "ash/content/gpu_support_impl.h"

#include "ash/pointer_watcher_delegate_aura.h"

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

+#include "ash/shell.h"

#include "ash/wm/mru_window_tracker.h"

#include "ash/wm/window_util.h"

#include "base/command_line.h"