Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
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/login/screen_observer.h" 14 #include "chrome/browser/chromeos/login/screen_observer.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/policy/auto_enrollment_client.h" 16 #include "chrome/browser/policy/auto_enrollment_client.h"
17 #include "chrome/browser/policy/browser_policy_connector.h" 17 #include "chrome/browser/policy/browser_policy_connector.h"
18 #include "chrome/browser/policy/cloud_policy_data_store.h" 18 #include "chrome/browser/policy/cloud_policy_data_store.h"
19 #include "chrome/browser/policy/enterprise_metrics.h" 19 #include "chrome/browser/policy/enterprise_metrics.h"
20 #include "chrome/common/net/gaia/gaia_auth_util.h"
21 #include "chromeos/dbus/dbus_thread_manager.h" 20 #include "chromeos/dbus/dbus_thread_manager.h"
22 #include "chromeos/dbus/session_manager_client.h" 21 #include "chromeos/dbus/session_manager_client.h"
22 #include "google_apis/gaia/gaia_auth_util.h"
23 23
24 namespace chromeos { 24 namespace chromeos {
25 25
26 namespace { 26 namespace {
27 27
28 // Retry for InstallAttrs initialization every 500ms. 28 // Retry for InstallAttrs initialization every 500ms.
29 const int kLockRetryIntervalMs = 500; 29 const int kLockRetryIntervalMs = 500;
30 // Maximum time to retry InstallAttrs initialization before we give up. 30 // Maximum time to retry InstallAttrs initialization before we give up.
31 const int kLockRetryTimeoutMs = 10 * 60 * 1000; // 10 minutes. 31 const int kLockRetryTimeoutMs = 10 * 60 * 1000; // 10 minutes.
32 32
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 return; 268 return;
269 } 269 }
270 NOTREACHED(); 270 NOTREACHED();
271 if (is_showing_) { 271 if (is_showing_) {
272 actor_->ShowEnrollmentError( 272 actor_->ShowEnrollmentError(
273 EnterpriseEnrollmentScreenActor::FATAL_ERROR); 273 EnterpriseEnrollmentScreenActor::FATAL_ERROR);
274 } 274 }
275 } 275 }
276 276
277 } // namespace chromeos 277 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698