chrome/browser/ui/ash/ash_init.cc - Issue 10694127: browser: Move some ash files into ui/ash.

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

Issue 10694127: browser: Move some ash files into ui/ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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/ui/ash/ash_init.cc

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

index e0d400a6d8a84bbac1893ec4bdca1a9128aee894..14c9a521c56051c9a0afee43e6b480a5f129d4ac 100644

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

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

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

#include "base/command_line.h"

#include "chrome/browser/chromeos/accessibility/accessibility_util.h"

#include "chrome/browser/lifetime/application_lifetime.h"

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

+#include "chrome/browser/ui/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/common/chrome_switches.h"

#include "ui/aura/aura_switches.h"

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

#include "ui/aura/display_manager.h"

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

#include "ui/aura/root_window.h"

#include "ui/compositor/compositor_setup.h"

@@ -29,9 +29,9 @@

#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/ash/volume_controller_chromeos.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"

#endif