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

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

Issue 2944973002: Remove IS_IOS checks in chrome/ (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
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_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 registry->RegisterBooleanPref( 382 registry->RegisterBooleanPref(
383 prefs::kProfileUsingDefaultName, 383 prefs::kProfileUsingDefaultName,
384 true, 384 true,
385 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 385 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
386 registry->RegisterStringPref(prefs::kProfileName, 386 registry->RegisterStringPref(prefs::kProfileName,
387 std::string(), 387 std::string(),
388 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 388 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
389 #endif 389 #endif
390 390
391 registry->RegisterStringPref(prefs::kSupervisedUserId, std::string()); 391 registry->RegisterStringPref(prefs::kSupervisedUserId, std::string());
392 #if defined(OS_IOS) || defined(OS_ANDROID) 392 #if defined(OS_ANDROID)
393 uint32_t home_page_flags = PrefRegistry::NO_REGISTRATION_FLAGS; 393 uint32_t home_page_flags = PrefRegistry::NO_REGISTRATION_FLAGS;
394 #else 394 #else
395 uint32_t home_page_flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF; 395 uint32_t home_page_flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF;
396 #endif 396 #endif
397 registry->RegisterStringPref(prefs::kHomePage, 397 registry->RegisterStringPref(prefs::kHomePage,
398 std::string(), 398 std::string(),
399 home_page_flags); 399 home_page_flags);
400 registry->RegisterStringPref(prefs::kNewTabPageLocationOverride, 400 registry->RegisterStringPref(prefs::kNewTabPageLocationOverride,
401 std::string()); 401 std::string());
402 registry->RegisterIntegerPref(prefs::kDownloadRestrictions, 0); 402 registry->RegisterIntegerPref(prefs::kDownloadRestrictions, 0);
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 1394 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
1395 } 1395 }
1396 1396
1397 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { 1397 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() {
1398 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); 1398 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this);
1399 ProfileOAuth2TokenService* token_service = 1399 ProfileOAuth2TokenService* token_service =
1400 ProfileOAuth2TokenServiceFactory::GetForProfile(this); 1400 ProfileOAuth2TokenServiceFactory::GetForProfile(this);
1401 return base::MakeUnique<identity::IdentityService>(signin_manager, 1401 return base::MakeUnique<identity::IdentityService>(signin_manager,
1402 token_service); 1402 token_service);
1403 } 1403 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/session_startup_pref.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698