ash/accelerators/accelerator_controller.cc - Issue 10917075: events: Move some files into ui/base/events/

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 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 3 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 0f72f082ffffa71ea60377b860b2f17726d6c328..dda4f2d15f4ebb37b6965994b23e5ffb0d8579e7 100644

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

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

@@ -12,14 +12,14 @@

#include "ash/ash_switches.h"

#include "ash/caps_lock_delegate.h"

#include "ash/desktop_background/desktop_background_controller.h"

+#include "ash/display/display_controller.h"

+#include "ash/display/multi_display_manager.h"

#include "ash/focus_cycler.h"

#include "ash/ime_control_delegate.h"

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_delegate.h"

#include "ash/launcher/launcher_model.h"

#include "ash/magnifier/magnification_controller.h"

-#include "ash/display/display_controller.h"

-#include "ash/display/multi_display_manager.h"

#include "ash/root_window_controller.h"

#include "ash/rotator/screen_rotation.h"

#include "ash/screenshot_delegate.h"

@@ -41,7 +41,7 @@

#include "ui/aura/root_window.h"

#include "ui/base/accelerators/accelerator.h"

#include "ui/base/accelerators/accelerator_manager.h"

-#include "ui/base/event.h"

+#include "ui/base/events/event.h"

#include "ui/base/keycodes/keyboard_codes.h"

#include "ui/compositor/debug_utils.h"

#include "ui/compositor/layer.h"

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