chrome/browser/chrome_browser_main_extra_parts_aura.cc - Issue 9570044: Rename chrome/browser/ui/views/{aura => 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/chrome_browser_main_extra_parts_aura.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 10 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_aura.cc

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

index 930dcf1c6023481dc792cd7afd7dccd9b68b4a11..0237788cb9f3d830abf72cb1e342dccd04b2f04f 100644

--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc

@@ -9,20 +9,20 @@

#include "ash/shell.h"

#include "base/command_line.h"

#include "chrome/common/chrome_switches.h"

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

-#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"

-#include "chrome/browser/ui/views/aura/screen_orientation_listener.h"

-#include "chrome/browser/ui/views/aura/screenshot_taker.h"

-#include "chrome/browser/ui/views/aura/status_area_host_aura.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/screen_orientation_listener.h"

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

+#include "chrome/browser/ui/views/ash/status_area_host_aura.h"

#include "ui/aura/env.h"

#include "ui/aura/aura_switches.h"

#include "ui/aura/root_window.h"

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

#if defined(OS_CHROMEOS)

-#include "chrome/browser/ui/views/aura/brightness_controller_chromeos.h"

-#include "chrome/browser/ui/views/aura/ime_controller_chromeos.h"

-#include "chrome/browser/ui/views/aura/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"

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

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

#include "chrome/browser/chromeos/system/runtime_environment.h"

« no previous file with comments | « build/filename_rules.gypi ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »