ash/accelerators/accelerator_controller.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/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/accelerators/accelerator_controller.cc

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests Created 6 years, 8 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/accelerators/accelerator_controller.cc

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc

index 7d70bc78200b1c2ada22d10fe69e89724458d1e1..51f780c210b1aa5c37853b2bc28c7ad061465142 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -28,7 +28,7 @@

#include "ash/root_window_controller.h"

#include "ash/rotator/screen_rotation.h"

#include "ash/screenshot_delegate.h"

-#include "ash/session_state_delegate.h"

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

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_model.h"

@@ -71,7 +71,7 @@

#include "ui/views/widget/widget.h"

#if defined(OS_CHROMEOS)

-#include "ash/session_state_delegate.h"

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

#include "ash/system/chromeos/keyboard_brightness_controller.h"

#include "base/sys_info.h"

#include "chromeos/ime/ime_keyboard.h"

« no previous file with comments | « no previous file | ash/accelerators/nested_dispatcher_controller_unittest.cc » ('j') | no next file with comments »