ash/accelerators/accelerator_controller.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

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 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 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 2deeb9738543b4a5ca90d216a9b2e77439eef9fa..800bf44c8f1f47931aa613eae7209fb580369b5f 100644

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

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

@@ -5,14 +5,14 @@

#include "ash/accelerators/accelerator_controller.h"

#include "ash/accelerators/accelerator_table.h"

-#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/ash_switches.h"

#include "ash/caps_lock_delegate.h"

+#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/focus_cycler.h"

#include "ash/ime_control_delegate.h"

#include "ash/launcher/launcher.h"

-#include "ash/launcher/launcher_model.h"

#include "ash/launcher/launcher_delegate.h"

+#include "ash/launcher/launcher_model.h"

#include "ash/monitor/multi_monitor_manager.h"

#include "ash/screenshot_delegate.h"

#include "ash/shell.h"

@@ -30,11 +30,11 @@

#include "ui/aura/root_window.h"

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

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

-#include "ui/gfx/compositor/debug_utils.h"

-#include "ui/gfx/compositor/layer.h"

-#include "ui/gfx/compositor/layer_animation_sequence.h"

-#include "ui/gfx/compositor/layer_animator.h"

-#include "ui/gfx/compositor/screen_rotation.h"

+#include "ui/compositor/debug_utils.h"

+#include "ui/compositor/layer.h"

+#include "ui/compositor/layer_animation_sequence.h"

+#include "ui/compositor/layer_animator.h"

+#include "ui/compositor/screen_rotation.h"

#include "ui/oak/oak.h"

namespace {

« no previous file with comments | « WATCHLISTS ('k') | ash/app_list/app_list.h » ('j') | no next file with comments »