Merge pull request #49 from uazo/create-pull-request/patch-c1733ac
Git apply result for next-v112 branch
This commit is contained in:
@@ -139,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -7100,6 +7100,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7097,6 +7097,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)},
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "services/media_session/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
@@ -7308,6 +7309,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7305,6 +7306,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
||||
@@ -344,7 +344,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/version_info/version_info.h"
|
||||
#include "components/viz/common/features.h"
|
||||
#include "components/viz/common/switches.h"
|
||||
@@ -7333,6 +7334,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7330,6 +7331,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
@@ -3298,6 +3300,20 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3295,6 +3297,20 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebrtcUseMinMaxVEADimensionsName,
|
||||
flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)},
|
||||
|
||||
Reference in New Issue
Block a user