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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 #endif 418 #endif
419 419
420 #if BUILDFLAG(ENABLE_PLUGINS) 420 #if BUILDFLAG(ENABLE_PLUGINS)
421 using plugins::ChromeContentBrowserClientPluginsPart; 421 using plugins::ChromeContentBrowserClientPluginsPart;
422 #endif 422 #endif
423 423
424 namespace { 424 namespace {
425 425
426 // Cached version of the locale so we can return the locale on the I/O 426 // Cached version of the locale so we can return the locale on the I/O
427 // thread. 427 // thread.
428 base::LazyInstance<std::string> g_io_thread_application_locale; 428 base::LazyInstance<std::string>::DestructorAtExit
429 g_io_thread_application_locale;
Nico 2017/03/07 21:43:02 maybe add = LAZY_INSTANCE_INITIALIZER while here (
scottmg 2017/03/07 21:56:30 Done.
429 430
430 const storage::QuotaSettings* g_default_quota_settings; 431 const storage::QuotaSettings* g_default_quota_settings;
431 432
432 #if BUILDFLAG(ENABLE_PLUGINS) 433 #if BUILDFLAG(ENABLE_PLUGINS)
433 // TODO(teravest): Add renderer-side API-specific checking for these APIs so 434 // TODO(teravest): Add renderer-side API-specific checking for these APIs so
434 // that blanket permission isn't granted to all dev channel APIs for these. 435 // that blanket permission isn't granted to all dev channel APIs for these.
435 // http://crbug.com/386743 436 // http://crbug.com/386743
436 const char* const kPredefinedAllowedDevChannelOrigins[] = { 437 const char* const kPredefinedAllowedDevChannelOrigins[] = {
437 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937 438 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937
438 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937 439 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937
(...skipping 3112 matching lines...) Expand 10 before | Expand all | Expand 10 after
3551 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3552 return variations::GetVariationParamValue( 3553 return variations::GetVariationParamValue(
3553 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3554 } 3555 }
3555 3556
3556 // static 3557 // static
3557 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3558 const storage::QuotaSettings* settings) { 3559 const storage::QuotaSettings* settings) {
3559 g_default_quota_settings = settings; 3560 g_default_quota_settings = settings;
3560 } 3561 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698