diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-20 17:35:21 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-20 17:35:21 +0000 |
| commit | 7edf30319847892be800a0127fee985a24050166 (patch) | |
| tree | 759f1b969b065d1737351e97d92affce4d4ca0c7 | |
| parent | b83d1c9b7b762a76a94c3e0d8a9f41351681ca97 (diff) | |
| download | chromium_src-7edf30319847892be800a0127fee985a24050166.zip chromium_src-7edf30319847892be800a0127fee985a24050166.tar.gz chromium_src-7edf30319847892be800a0127fee985a24050166.tar.bz2 | |
Stop depending on cros/chromeos_cryptohome.h
BUG=chromium-os:16552
TEST=build success
Review URL: http://codereview.chromium.org/9426028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122767 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/auth_attempt_state.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/test_attempt_state.cc | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc index e11b7a40..bcb6288 100644 --- a/chrome/browser/chromeos/login/auth_attempt_state.cc +++ b/chrome/browser/chromeos/login/auth_attempt_state.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "content/public/browser/browser_thread.h" -#include "third_party/cros/chromeos_cryptohome.h" +#include "third_party/cros_system_api/dbus/service_constants.h" using content::BrowserThread; @@ -33,7 +33,7 @@ AuthAttemptState::AuthAttemptState(const std::string& username, is_first_time_user_(user_is_new), cryptohome_complete_(false), cryptohome_outcome_(false), - cryptohome_code_(kCryptohomeMountErrorNone) { + cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) { } AuthAttemptState::AuthAttemptState(const std::string& username, @@ -48,7 +48,7 @@ AuthAttemptState::AuthAttemptState(const std::string& username, is_first_time_user_(false), cryptohome_complete_(false), cryptohome_outcome_(false), - cryptohome_code_(kCryptohomeMountErrorNone) { + cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) { } AuthAttemptState::AuthAttemptState(const std::string& username, @@ -66,7 +66,7 @@ AuthAttemptState::AuthAttemptState(const std::string& username, is_first_time_user_(user_is_new), cryptohome_complete_(false), cryptohome_outcome_(false), - cryptohome_code_(kCryptohomeMountErrorNone) { + cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) { } AuthAttemptState::~AuthAttemptState() {} @@ -100,7 +100,7 @@ void AuthAttemptState::ResetCryptohomeStatus() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); cryptohome_complete_ = false; cryptohome_outcome_ = false; - cryptohome_code_ = kCryptohomeMountErrorNone; + cryptohome_code_ = cryptohome::MOUNT_ERROR_NONE; } bool AuthAttemptState::online_complete() { diff --git a/chrome/browser/chromeos/login/test_attempt_state.cc b/chrome/browser/chromeos/login/test_attempt_state.cc index 3258a5d..2193a9b 100644 --- a/chrome/browser/chromeos/login/test_attempt_state.cc +++ b/chrome/browser/chromeos/login/test_attempt_state.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,6 @@ #include <string> #include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "third_party/cros/chromeos_cryptohome.h" namespace chromeos { |