chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.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/login/enrollment/enterprise_enrollment_screen.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/base_login_display_host.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

index a7d2e8b0753436045638218f89c217b518c289f9..f87451db23471090cb292a09c4f7d0aa83c9a61e 100644

--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

@@ -11,14 +11,14 @@

#include "chrome/browser/browser_process.h"

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

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

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

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

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

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

#include "chrome/browser/policy/auto_enrollment_client.h"

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/policy/cloud_policy_data_store.h"

#include "chrome/browser/policy/enterprise_metrics.h"

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

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

namespace chromeos {