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

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

Issue 2092293002: Block framebusts without a user gesture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1986 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 IDS_FLAGS_PASSIVE_EVENT_LISTENERS_DUE_TO_FLING_NAME, 1997 IDS_FLAGS_PASSIVE_EVENT_LISTENERS_DUE_TO_FLING_NAME,
1998 IDS_FLAGS_PASSIVE_EVENT_LISTENERS_DUE_TO_FLING_DESCRIPTION, kOsAll, 1998 IDS_FLAGS_PASSIVE_EVENT_LISTENERS_DUE_TO_FLING_DESCRIPTION, kOsAll,
1999 FEATURE_VALUE_TYPE(features::kPassiveEventListenersDueToFling)}, 1999 FEATURE_VALUE_TYPE(features::kPassiveEventListenersDueToFling)},
2000 {"enable-loading-ipc-optimization-for-small-resources", 2000 {"enable-loading-ipc-optimization-for-small-resources",
2001 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_NAME, 2001 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_NAME,
2002 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_DESCRIPTION, kOsAll, 2002 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_DESCRIPTION, kOsAll,
2003 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)}, 2003 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)},
2004 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME, 2004 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME,
2005 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, 2005 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll,
2006 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, 2006 FEATURE_VALUE_TYPE(features::kFontCacheScaling)},
2007 {"enable-framebusting-needs-sameorigin-or-usergesture",
2008 IDS_FLAGS_FRAMEBUSTING_NAME, IDS_FLAGS_FRAMEBUSTING_DESCRIPTION, kOsAll,
2009 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)},
2007 #if defined(OS_ANDROID) 2010 #if defined(OS_ANDROID)
2008 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, 2011 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME,
2009 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, 2012 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid,
2010 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, 2013 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell,
2011 switches::kDisableVrShell)}, 2014 switches::kDisableVrShell)},
2012 {"enable-android-pay-integration-v1", 2015 {"enable-android-pay-integration-v1",
2013 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, 2016 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME,
2014 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, 2017 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid,
2015 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, 2018 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)},
2016 #endif 2019 #endif
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2225 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2228 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2226 2229
2227 const FeatureEntry* GetFeatureEntries(size_t* count) { 2230 const FeatureEntry* GetFeatureEntries(size_t* count) {
2228 *count = arraysize(kFeatureEntries); 2231 *count = arraysize(kFeatureEntries);
2229 return kFeatureEntries; 2232 return kFeatureEntries;
2230 } 2233 }
2231 2234
2232 } // namespace testing 2235 } // namespace testing
2233 2236
2234 } // namespace about_flags 2237 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698