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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 256
257 ExtensionService* OffTheRecordProfileImpl::GetExtensionService() { 257 ExtensionService* OffTheRecordProfileImpl::GetExtensionService() {
258 return extensions::ExtensionSystem::Get(this)->extension_service(); 258 return extensions::ExtensionSystem::Get(this)->extension_service();
259 } 259 }
260 260
261 ExtensionSpecialStoragePolicy* 261 ExtensionSpecialStoragePolicy*
262 OffTheRecordProfileImpl::GetExtensionSpecialStoragePolicy() { 262 OffTheRecordProfileImpl::GetExtensionSpecialStoragePolicy() {
263 return GetOriginalProfile()->GetExtensionSpecialStoragePolicy(); 263 return GetOriginalProfile()->GetExtensionSpecialStoragePolicy();
264 } 264 }
265 265
266 bool OffTheRecordProfileImpl::IsManaged() { 266 bool OffTheRecordProfileImpl::IsSupervised() {
267 return GetOriginalProfile()->IsManaged(); 267 return GetOriginalProfile()->IsSupervised();
268 } 268 }
269 269
270 PrefService* OffTheRecordProfileImpl::GetPrefs() { 270 PrefService* OffTheRecordProfileImpl::GetPrefs() {
271 return prefs_; 271 return prefs_;
272 } 272 }
273 273
274 PrefService* OffTheRecordProfileImpl::GetOffTheRecordPrefs() { 274 PrefService* OffTheRecordProfileImpl::GetOffTheRecordPrefs() {
275 return prefs_; 275 return prefs_;
276 } 276 }
277 277
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 595 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
596 #if defined(OS_CHROMEOS) 596 #if defined(OS_CHROMEOS)
597 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 597 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
598 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 598 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
599 g_browser_process->local_state()); 599 g_browser_process->local_state());
600 } 600 }
601 #endif // defined(OS_CHROMEOS) 601 #endif // defined(OS_CHROMEOS)
602 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 602 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
603 GetPrefs(), g_browser_process->local_state()); 603 GetPrefs(), g_browser_process->local_state());
604 } 604 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698