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

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

Issue 2927303003: Add hooks to allow lock screen app pages in sign-in profile (Closed)
Patch Set: . Created 3 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
« no previous file with comments | « chrome/browser/extensions/chrome_process_manager_delegate.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profile_manager.h" 5 #include "chrome/browser/profiles/profile_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 TRACE_EVENT0("browser", "ProfileManager::DoFinalInitForServices"); 1200 TRACE_EVENT0("browser", "ProfileManager::DoFinalInitForServices");
1201 1201
1202 #if BUILDFLAG(ENABLE_EXTENSIONS) 1202 #if BUILDFLAG(ENABLE_EXTENSIONS)
1203 bool extensions_enabled = !go_off_the_record; 1203 bool extensions_enabled = !go_off_the_record;
1204 #if defined(OS_CHROMEOS) 1204 #if defined(OS_CHROMEOS)
1205 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 1205 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
1206 switches::kDisableLoginScreenApps) && 1206 switches::kDisableLoginScreenApps) &&
1207 chromeos::ProfileHelper::IsSigninProfile(profile)) { 1207 chromeos::ProfileHelper::IsSigninProfile(profile)) {
1208 extensions_enabled = true; 1208 extensions_enabled = true;
1209 } 1209 }
1210 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1211 chromeos::switches::kEnableLockScreenApps) &&
1212 chromeos::ProfileHelper::IsSigninProfile(profile)) {
1213 extensions_enabled = true;
1214 }
1210 #endif 1215 #endif
1211 extensions::ExtensionSystem::Get(profile)->InitForRegularProfile( 1216 extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
1212 extensions_enabled); 1217 extensions_enabled);
1213 1218
1214 // Set the block extensions bit on the ExtensionService. There likely are no 1219 // Set the block extensions bit on the ExtensionService. There likely are no
1215 // blockable extensions to block. 1220 // blockable extensions to block.
1216 ProfileAttributesEntry* entry; 1221 ProfileAttributesEntry* entry;
1217 bool has_entry = GetProfileAttributesStorage(). 1222 bool has_entry = GetProfileAttributesStorage().
1218 GetProfileAttributesWithPath(profile->GetPath(), &entry); 1223 GetProfileAttributesWithPath(profile->GetPath(), &entry);
1219 if (has_entry && entry->IsSigninRequired()) { 1224 if (has_entry && entry->IsSigninRequired()) {
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 1770
1766 const base::FilePath new_active_profile_dir = 1771 const base::FilePath new_active_profile_dir =
1767 found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath(); 1772 found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath();
1768 FinishDeletingProfile(profile_dir, new_active_profile_dir); 1773 FinishDeletingProfile(profile_dir, new_active_profile_dir);
1769 } 1774 }
1770 #endif // !defined(OS_ANDROID) 1775 #endif // !defined(OS_ANDROID)
1771 1776
1772 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1777 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1773 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1778 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1774 } 1779 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_process_manager_delegate.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698