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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 years, 9 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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 home_page_flags); 387 home_page_flags);
388 registry->RegisterStringPref(prefs::kNewTabPageLocationOverride, 388 registry->RegisterStringPref(prefs::kNewTabPageLocationOverride,
389 std::string()); 389 std::string());
390 #if BUILDFLAG(ENABLE_PRINTING) 390 #if BUILDFLAG(ENABLE_PRINTING)
391 registry->RegisterBooleanPref(prefs::kPrintingEnabled, true); 391 registry->RegisterBooleanPref(prefs::kPrintingEnabled, true);
392 #endif 392 #endif
393 registry->RegisterBooleanPref(prefs::kPrintPreviewDisabled, false); 393 registry->RegisterBooleanPref(prefs::kPrintPreviewDisabled, false);
394 registry->RegisterStringPref( 394 registry->RegisterStringPref(
395 prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string()); 395 prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
396 registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); 396 registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
397 #if defined(ENABLE_MEDIA_ROUTER)
398 registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true); 397 registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true);
399 #if !defined(OS_ANDROID) 398 #if !defined(OS_ANDROID)
400 registry->RegisterBooleanPref(prefs::kShowCastIconInToolbar, false); 399 registry->RegisterBooleanPref(prefs::kShowCastIconInToolbar, false);
401 #endif // !defined(OS_ANDROID) 400 #endif // !defined(OS_ANDROID)
402 #endif // defined(ENABLE_MEDIA_ROUTER)
403 // Initialize the cache prefs. 401 // Initialize the cache prefs.
404 registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); 402 registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
405 registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); 403 registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
406 registry->RegisterIntegerPref(prefs::kMediaCacheSize, 0); 404 registry->RegisterIntegerPref(prefs::kMediaCacheSize, 0);
407 } 405 }
408 406
409 ProfileImpl::ProfileImpl( 407 ProfileImpl::ProfileImpl(
410 const base::FilePath& path, 408 const base::FilePath& path,
411 Delegate* delegate, 409 Delegate* delegate,
412 CreateMode create_mode, 410 CreateMode create_mode,
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1324 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1327 domain_reliability::DomainReliabilityService* service = 1325 domain_reliability::DomainReliabilityService* service =
1328 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1326 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1329 GetForBrowserContext(this); 1327 GetForBrowserContext(this);
1330 if (!service) 1328 if (!service)
1331 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); 1329 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>();
1332 1330
1333 return service->CreateMonitor( 1331 return service->CreateMonitor(
1334 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 1332 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
1335 } 1333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698