chrome/browser/chromeos/settings/device_settings_service.cc - Issue 14008005: Move proto files back into chrome/browser/policy/proto

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/settings/device_settings_service.h"	5 #include "chrome/browser/chromeos/settings/device_settings_service.h"

6	6

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

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

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

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

11 #include "base/stl_util.h"	11 #include "base/stl_util.h"

12 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

13 #include "chrome/browser/chromeos/settings/owner_key_util.h"	12 #include "chrome/browser/chromeos/settings/owner_key_util.h"

14 #include "chrome/browser/chromeos/settings/session_manager_operation.h"	13 #include "chrome/browser/chromeos/settings/session_manager_operation.h"

15 #include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"	14 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"

	15 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"

16 #include "chrome/common/chrome_notification_types.h"	16 #include "chrome/common/chrome_notification_types.h"

17 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

18 #include "content/public/browser/notification_service.h"	18 #include "content/public/browser/notification_service.h"

19 #include "content/public/browser/notification_source.h"	19 #include "content/public/browser/notification_source.h"

20 #include "crypto/rsa_private_key.h"	20 #include "crypto/rsa_private_key.h"

21	21

22 namespace em = enterprise_management;	22 namespace em = enterprise_management;

23	23

24 namespace {	24 namespace {

25	25

(...skipping 292 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
318	318

319 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() {	319 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() {

320 DeviceSettingsService::Initialize();	320 DeviceSettingsService::Initialize();

321 }	321 }

322	322

323 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {	323 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {

324 DeviceSettingsService::Shutdown();	324 DeviceSettingsService::Shutdown();

325 }	325 }

326	326

327 } // namespace chromeos	327 } // namespace chromeos

OLD	NEW