chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

Side by Side 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/metrics/histogram.h"	10 #include "base/metrics/histogram.h"

11 #include "chrome/browser/browser_process.h"	11 #include "chrome/browser/browser_process.h"

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

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

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

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

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

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

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

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

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

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

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

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

22	22

23 namespace chromeos {	23 namespace chromeos {

24	24

25 namespace {	25 namespace {

26	26

27 // Retry for InstallAttrs initialization every 500ms.	27 // Retry for InstallAttrs initialization every 500ms.

28 const int kLockRetryIntervalMs = 500;	28 const int kLockRetryIntervalMs = 500;

29	29

30 } // namespace	30 } // namespace

31	31

(...skipping 196 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228 // and notify us of progress through CloudPolicySubsystem::Observer.	228 // and notify us of progress through CloudPolicySubsystem::Observer.

229 connector->RegisterForDevicePolicy(user_, token, is_auto_enrollment_);	229 connector->RegisterForDevicePolicy(user_, token, is_auto_enrollment_);

230 return;	230 return;

231 }	231 }

232 NOTREACHED();	232 NOTREACHED();

233 if (is_showing_)	233 if (is_showing_)

234 actor_->ShowFatalEnrollmentError();	234 actor_->ShowFatalEnrollmentError();

235 }	235 }

236	236

237 } // namespace chromeos	237 } // namespace chromeos

OLD	NEW