chrome/browser/automation/testing_automation_provider_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/automation/testing_automation_provider_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/automation/testing_automation_provider_chromeos.cc

diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc

index e4f1f4964d0fefb8a3626c478e82a2fccc78d8b8..6056e595c39293a4e78bdd7854aad641c16b54ee 100644

--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc

+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc

@@ -16,9 +16,6 @@

#include "chrome/browser/chromeos/audio/audio_handler.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/dbus/update_engine_client.h"

#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"

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

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

@@ -41,6 +38,9 @@

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

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/pref_names.h"

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

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

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

#include "net/base/network_change_notifier.h"

#include "policy/policy_constants.h"

#include "ui/views/widget/widget.h"