Commit 3934bf70 authored by edchin's avatar edchin Committed by Commit Bot

[ios] Update Drag and Drop flag

This CL removes current uses of the drag and drop flag
since they have been in stable use for several years now.

This drag and drop flag will be used to continue adding
drag and drop features in M85.

Bug: 1087844
Change-Id: I6b4b48ca3d95ede89cd51b76c0e24acad4fddcc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2233723Reviewed-by: default avatarStepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776215}
parent a69e11c3
......@@ -9,7 +9,7 @@
#endif
const base::Feature kDragAndDrop{"DragAndDrop",
base::FEATURE_ENABLED_BY_DEFAULT};
base::FEATURE_DISABLED_BY_DEFAULT};
bool DragAndDropIsEnabled() {
return base::FeatureList::IsEnabled(kDragAndDrop);
......
......@@ -16,7 +16,6 @@
#include "base/strings/sys_string_conversions.h"
#include "components/favicon/ios/web_favicon_driver.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/drag_and_drop/drag_and_drop_flag.h"
#import "ios/chrome/browser/drag_and_drop/drop_and_navigate_delegate.h"
#import "ios/chrome/browser/drag_and_drop/drop_and_navigate_interaction.h"
#include "ios/chrome/browser/main/browser.h"
......@@ -487,11 +486,9 @@ UIColor* BackgroundColor() {
action:@selector(recordUserMetrics:)
forControlEvents:UIControlEventTouchUpInside];
if (DragAndDropIsEnabled()) {
_buttonNewTabInteraction =
[[DropAndNavigateInteraction alloc] initWithDelegate:self];
[_buttonNewTab addInteraction:_buttonNewTabInteraction];
}
_buttonNewTabInteraction =
[[DropAndNavigateInteraction alloc] initWithDelegate:self];
[_buttonNewTab addInteraction:_buttonNewTabInteraction];
#if defined(__IPHONE_13_4)
if (@available(iOS 13.4, *)) {
......
......@@ -10,7 +10,6 @@
#include "base/feature_list.h"
#include "base/ios/ios_util.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/chrome/browser/drag_and_drop/drag_and_drop_flag.h"
#include "ios/chrome/browser/drag_and_drop/drop_and_navigate_delegate.h"
#include "ios/chrome/browser/drag_and_drop/drop_and_navigate_interaction.h"
#include "ios/chrome/browser/system_flags.h"
......@@ -138,11 +137,9 @@ UIImage* DefaultFaviconImage() {
action:@selector(tabWasTapped)
forControlEvents:UIControlEventTouchUpInside];
if (DragAndDropIsEnabled()) {
_dropInteraction =
[[DropAndNavigateInteraction alloc] initWithDelegate:self];
[self addInteraction:_dropInteraction];
}
_dropInteraction =
[[DropAndNavigateInteraction alloc] initWithDelegate:self];
[self addInteraction:_dropInteraction];
}
return self;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment