chrome/browser/chrome_browser_main_extra_parts_ash.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: chrome/browser/chrome_browser_main_extra_parts_ash.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: chrome/browser/chrome_browser_main_extra_parts_ash.cc

diff --git a/chrome/browser/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/chrome_browser_main_extra_parts_ash.cc

index 37fffbab3a0aed3a87f06ffab325140ffe7e9315..a409e361877dc9e3558363a1b66e0fe64bfdf79e 100644

--- a/chrome/browser/chrome_browser_main_extra_parts_ash.cc

+++ b/chrome/browser/chrome_browser_main_extra_parts_ash.cc

@@ -10,27 +10,27 @@

#include "ash/wm/key_rewriter_event_filter.h"

#include "ash/wm/property_util.h"

#include "base/command_line.h"

-#include "chrome/common/chrome_switches.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/views/ash/caps_lock_handler.h"

#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"

#include "chrome/browser/ui/views/ash/key_rewriter.h"

#include "chrome/browser/ui/views/ash/screenshot_taker.h"

#include "chrome/browser/ui/views/ash/user_gesture_handler.h"

-#include "ui/aura/env.h"

+#include "chrome/common/chrome_switches.h"

#include "ui/aura/aura_switches.h"

#include "ui/aura/client/user_gesture_client.h"

+#include "ui/aura/env.h"

#include "ui/aura/monitor_manager.h"

#include "ui/aura/root_window.h"

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

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

#if defined(OS_CHROMEOS)

#include "base/chromeos/chromeos_version.h"

+#include "chrome/browser/chromeos/input_method/input_method_manager.h"

+#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"

#include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"

#include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"

-#include "chrome/browser/chromeos/input_method/input_method_manager.h"

-#include "chrome/browser/chromeos/login/user_manager.h"

#endif

ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh()

« no previous file with comments | « build/all.gyp ('k') | chrome/browser/chromeos/login/base_login_display_host.cc » ('j') | no next file with comments »