chrome/browser/ui/views/ash/chrome_shell_delegate.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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/views/ash/chrome_shell_delegate.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase 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/ui/views/ash/chrome_shell_delegate.cc

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

index 4c0006f34d81cbe70031f02555f366295e715910..4aa8672525a6e6602b817b202245c8e48bf23f00 100644

--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc

@@ -26,11 +26,11 @@

#if defined(OS_CHROMEOS)

#include "base/chromeos/chromeos_version.h"

#include "chrome/browser/chromeos/background/desktop_background_observer.h"

-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

-#include "chrome/browser/chromeos/dbus/power_manager_client.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

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

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

+#include "chromeos/dbus/dbus_thread_manager.h"

+#include "chromeos/dbus/power_manager_client.h"

#endif

// static