chrome/browser/chromeos/chrome_browser_main_chromeos.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/chrome_browser_main_chromeos.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/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index d3bf0e848e37ea832af3765aa34d89f89811482a..b7aa6922c88b57314c210ecb35ff67f0ec709463 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -12,15 +12,12 @@

#include "base/message_loop.h"

#include "base/string_number_conversions.h"

#include "chrome/browser/browser_process_impl.h"

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

#include "chrome/browser/chromeos/audio/audio_handler.h"

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

#include "chrome/browser/chromeos/boot_times_loader.h"

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

#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"

#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"

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

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

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

#include "chrome/browser/chromeos/disks/disk_mount_manager.h"

#include "chrome/browser/chromeos/external_metrics.h"

#include "chrome/browser/chromeos/imageburner/burn_manager.h"

@@ -64,6 +61,9 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/pref_names.h"

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

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

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

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

#include "content/public/common/main_function_params.h"

#include "grit/platform_locale_settings.h"