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

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

Issue 2733023002: [Origin Trials] Support updates of disabled token list (Closed)
Patch Set: Address comments 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 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1869 switches::kEnableNaClDebug, 1869 switches::kEnableNaClDebug,
1870 switches::kEnableNaClNonSfiMode, 1870 switches::kEnableNaClNonSfiMode,
1871 #endif 1871 #endif
1872 switches::kEnableNetBenchmarking, 1872 switches::kEnableNetBenchmarking,
1873 switches::kEnableNewBookmarkApps, 1873 switches::kEnableNewBookmarkApps,
1874 #if !defined(DISABLE_NACL) 1874 #if !defined(DISABLE_NACL)
1875 switches::kForcePNaClSubzero, 1875 switches::kForcePNaClSubzero,
1876 #endif 1876 #endif
1877 switches::kJavaScriptHarmony, 1877 switches::kJavaScriptHarmony,
1878 switches::kOriginTrialDisabledFeatures, 1878 switches::kOriginTrialDisabledFeatures,
1879 switches::kOriginTrialDisabledTokens,
1879 switches::kOriginTrialPublicKey, 1880 switches::kOriginTrialPublicKey,
1880 switches::kPpapiFlashArgs, 1881 switches::kPpapiFlashArgs,
1881 switches::kPpapiFlashPath, 1882 switches::kPpapiFlashPath,
1882 switches::kPpapiFlashVersion, 1883 switches::kPpapiFlashVersion,
1883 switches::kProfilingAtStart, 1884 switches::kProfilingAtStart,
1884 switches::kProfilingFile, 1885 switches::kProfilingFile,
1885 switches::kProfilingFlush, 1886 switches::kProfilingFlush,
1886 switches::kReaderModeHeuristics, 1887 switches::kReaderModeHeuristics,
1887 switches::kUnsafelyTreatInsecureOriginAsSecure, 1888 switches::kUnsafelyTreatInsecureOriginAsSecure,
1888 translate::switches::kTranslateSecurityOrigin, 1889 translate::switches::kTranslateSecurityOrigin,
(...skipping 1663 matching lines...) Expand 10 before | Expand all | Expand 10 after
3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3553 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3553 return variations::GetVariationParamValue( 3554 return variations::GetVariationParamValue(
3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3555 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3555 } 3556 }
3556 3557
3557 // static 3558 // static
3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3559 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3559 const storage::QuotaSettings* settings) { 3560 const storage::QuotaSettings* settings) {
3560 g_default_quota_settings = settings; 3561 g_default_quota_settings = settings;
3561 } 3562 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_origin_trials_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698