chrome/browser/chromeos/system/ash_system_tray_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/chromeos/system/ash_system_tray_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/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 22dc446da162a6daede4a22eaac59b9a8bf87c75..85984fb92bbdac185de5d123d686ae84bdd0d1ac 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -28,8 +28,6 @@

#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/network_library.h"

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

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

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

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

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

@@ -51,8 +49,10 @@

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

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

#include "chrome/browser/upgrade_detector.h"

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

#include "chrome/common/chrome_notification_types.h"

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

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

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

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_service.h"

#include "grit/generated_resources.h"