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

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

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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/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/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/chromeos/settings/owner_key_util.h" 12 #include "chrome/browser/chromeos/settings/owner_key_util.h"
12 #include "chrome/browser/chromeos/settings/session_manager_operation.h" 13 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
13 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h" 14 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
14 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" 15 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
15 #include "chrome/common/chrome_notification_types.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/notification_source.h" 18 #include "content/public/browser/notification_source.h"
19 #include "crypto/rsa_private_key.h" 19 #include "crypto/rsa_private_key.h"
20 20
21 namespace em = enterprise_management; 21 namespace em = enterprise_management;
22 22
23 namespace { 23 namespace {
24 24
25 // Delay between load retries when there was a validation error. 25 // Delay between load retries when there was a validation error.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 317
318 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() { 318 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() {
319 DeviceSettingsService::Initialize(); 319 DeviceSettingsService::Initialize();
320 } 320 }
321 321
322 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { 322 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {
323 DeviceSettingsService::Shutdown(); 323 DeviceSettingsService::Shutdown();
324 } 324 }
325 325
326 } // namespace chromeos 326 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698