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

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

Issue 2765083002: Hardcode extensions::util::IsNewBookmarkAppsEnabled() to true, except on Mac. (Closed)
Patch Set: remove logging 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 1844 matching lines...) Expand 10 before | Expand all | Expand 10 after
1855 extensions::switches::kNativeCrxBindings, 1855 extensions::switches::kNativeCrxBindings,
1856 extensions::switches::kWhitelistedExtensionID, 1856 extensions::switches::kWhitelistedExtensionID,
1857 #endif 1857 #endif
1858 switches::kAllowInsecureLocalhost, 1858 switches::kAllowInsecureLocalhost,
1859 switches::kAppsGalleryURL, 1859 switches::kAppsGalleryURL,
1860 switches::kCloudPrintURL, 1860 switches::kCloudPrintURL,
1861 switches::kCloudPrintXmppEndpoint, 1861 switches::kCloudPrintXmppEndpoint,
1862 switches::kDisableBundledPpapiFlash, 1862 switches::kDisableBundledPpapiFlash,
1863 switches::kDisableCastStreamingHWEncoding, 1863 switches::kDisableCastStreamingHWEncoding,
1864 switches::kDisableJavaScriptHarmonyShipping, 1864 switches::kDisableJavaScriptHarmonyShipping,
1865 switches::kDisableNewBookmarkApps,
tapted 2017/03/22 02:34:02 Using base::Feature allows this stuff to happen au
1866 switches::kEnableBenchmarking, 1865 switches::kEnableBenchmarking,
1867 switches::kEnableDistillabilityService, 1866 switches::kEnableDistillabilityService,
1868 switches::kEnableNaCl, 1867 switches::kEnableNaCl,
1869 #if !defined(DISABLE_NACL) 1868 #if !defined(DISABLE_NACL)
1870 switches::kEnableNaClDebug, 1869 switches::kEnableNaClDebug,
1871 switches::kEnableNaClNonSfiMode, 1870 switches::kEnableNaClNonSfiMode,
1872 #endif 1871 #endif
1873 switches::kEnableNetBenchmarking, 1872 switches::kEnableNetBenchmarking,
1874 switches::kEnableNewBookmarkApps,
1875 #if !defined(DISABLE_NACL) 1873 #if !defined(DISABLE_NACL)
1876 switches::kForcePNaClSubzero, 1874 switches::kForcePNaClSubzero,
1877 #endif 1875 #endif
1878 switches::kJavaScriptHarmony, 1876 switches::kJavaScriptHarmony,
1879 switches::kOriginTrialDisabledFeatures, 1877 switches::kOriginTrialDisabledFeatures,
1880 switches::kOriginTrialPublicKey, 1878 switches::kOriginTrialPublicKey,
1881 switches::kPpapiFlashArgs, 1879 switches::kPpapiFlashArgs,
1882 switches::kPpapiFlashPath, 1880 switches::kPpapiFlashPath,
1883 switches::kPpapiFlashVersion, 1881 switches::kPpapiFlashVersion,
1884 switches::kProfilingAtStart, 1882 switches::kProfilingAtStart,
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
3553 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3551 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3554 return variations::GetVariationParamValue( 3552 return variations::GetVariationParamValue(
3555 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3553 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3556 } 3554 }
3557 3555
3558 // static 3556 // static
3559 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3557 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3560 const storage::QuotaSettings* settings) { 3558 const storage::QuotaSettings* settings) {
3561 g_default_quota_settings = settings; 3559 g_default_quota_settings = settings;
3562 } 3560 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698