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

Side by Side Diff: chrome/browser/chromeos/settings/session_manager_operation.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed GYP file. Created 6 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/settings/session_manager_operation.h" 5 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/task_runner_util.h" 12 #include "base/task_runner_util.h"
13 #include "base/threading/sequenced_worker_pool.h" 13 #include "base/threading/sequenced_worker_pool.h"
14 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 14 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
15 #include "chrome/browser/chromeos/settings/owner_key_util.h"
16 #include "chrome/browser/net/nss_context.h" 15 #include "chrome/browser/net/nss_context.h"
16 #include "components/ownership/owner_key_util.h"
17 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 17 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "crypto/rsa_private_key.h" 19 #include "crypto/rsa_private_key.h"
20 #include "crypto/signature_creator.h" 20 #include "crypto/signature_creator.h"
21 #include "policy/proto/device_management_backend.pb.h" 21 #include "policy/proto/device_management_backend.pb.h"
22 22
23 using ownership::OwnerKeyUtil;
24 using ownership::PublicKey;
25
23 namespace em = enterprise_management; 26 namespace em = enterprise_management;
24 27
25 namespace chromeos { 28 namespace chromeos {
26 29
27 SessionManagerOperation::SessionManagerOperation(const Callback& callback) 30 SessionManagerOperation::SessionManagerOperation(const Callback& callback)
28 : session_manager_client_(NULL), 31 : session_manager_client_(NULL),
29 weak_factory_(this), 32 weak_factory_(this),
30 callback_(callback), 33 callback_(callback),
31 force_key_load_(false), 34 force_key_load_(false),
32 is_loading_(false) {} 35 is_loading_(false) {}
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 } 290 }
288 291
289 void SignAndStoreSettingsOperation::HandleStoreResult(bool success) { 292 void SignAndStoreSettingsOperation::HandleStoreResult(bool success) {
290 if (!success) 293 if (!success)
291 ReportResult(DeviceSettingsService::STORE_OPERATION_FAILED); 294 ReportResult(DeviceSettingsService::STORE_OPERATION_FAILED);
292 else 295 else
293 StartLoading(); 296 StartLoading();
294 } 297 }
295 298
296 } // namespace chromeos 299 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698