1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- --- a/chrome/browser/sharing/features.cc
- +++ b/chrome/browser/sharing/features.cc
- @@ -30,3 +30,5 @@ BASE_FEATURE(kSharingSendViaSync,
- BASE_FEATURE(kSharingPreferVapid,
- "SharingPreferVapid",
- base::FEATURE_DISABLED_BY_DEFAULT);
- +
- +BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT);
- --- a/chrome/browser/sharing/features.h
- +++ b/chrome/browser/sharing/features.h
- @@ -34,4 +34,5 @@ BASE_DECLARE_FEATURE(kSharingSendViaSync
- // Feature flag for prefer sending sharing message using VAPID.
- BASE_DECLARE_FEATURE(kSharingPreferVapid);
-
- +BASE_DECLARE_FEATURE(kDisableQRGenerator);
- #endif // CHROME_BROWSER_SHARING_FEATURES_H_
- --- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
- +++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
- @@ -23,7 +23,7 @@ QRCodeGeneratorBubbleController::~QRCode
-
- // static
- bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) {
- - if (!url.SchemeIsHTTPOrHTTPS())
- + if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator))
- return false;
-
- return true;
- --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
- +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
- @@ -313,7 +313,8 @@ void LocationBarView::Init() {
-
- params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
- params.types_enabled.push_back(PageActionIconType::kClickToCall);
- - params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
- + if (!base::FeatureList::IsEnabled(kDisableQRGenerator))
- + params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
- if (base::FeatureList::IsEnabled(kWebOTPCrossDevice))
- params.types_enabled.push_back(PageActionIconType::kSmsRemoteFetcher);
- params.types_enabled.push_back(PageActionIconType::kManagePasswords);
- --- a/chrome/browser/ungoogled_flag_entries.h
- +++ b/chrome/browser/ungoogled_flag_entries.h
- @@ -64,4 +64,8 @@
- "Remove Tabsearch Button",
- "Removes the tabsearch button from the tabstrip. ungoogled-chromium flag",
- kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
- + {"disable-qr-generator",
- + "Disable QR Generator",
- + "Disables the QR generator for sharing page links. ungoogled-chromium flag",
- + kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
- #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|