diff options
author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 01:03:48 +0000 |
---|---|---|
committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 01:03:48 +0000 |
commit | d080d3e45d72575612058097b338c9aad8ef481c (patch) | |
tree | 8117352833e5595dc476db8d9bf6f7414c40db9c | |
parent | e9b84dd40be75e6855e96112718085e05ce53b0b (diff) | |
download | chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.zip chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.tar.gz chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.tar.bz2 |
Removes --ash-disable-drag-off-shelf flag
BUG=284772
Review URL: https://codereview.chromium.org/191413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256092 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | ash/ash_switches.cc | 8 | ||||
-rw-r--r-- | ash/ash_switches.h | 1 | ||||
-rw-r--r-- | ash/shelf/shelf_view.cc | 2 | ||||
-rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
-rw-r--r-- | chrome/browser/about_flags.cc | 7 |
5 files changed, 1 insertions, 23 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 79dab50..cd057dc 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -50,9 +50,6 @@ const char kAshDisableAlternateShelfLayout[] = // Disable ability to dock windows at the desktop edge. const char kAshDisableDockedWindows[] = "ash-disable-docked-windows"; -// Disable dragging items off the shelf to unpin them. -const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf"; - // Disables overview mode for window switching. const char kAshDisableOverviewMode[] = "ash-disable-overview-mode"; @@ -159,11 +156,6 @@ bool UseAlternateShelfLayout() { HasSwitch(kAshDisableAlternateShelfLayout); } -bool UseDragOffShelf() { - return !CommandLine::ForCurrentProcess()-> - HasSwitch(kAshDisableDragOffShelf); -} - bool UseImmersiveFullscreenForAllWindows() { return !CommandLine::ForCurrentProcess()->HasSwitch( kAshEnableImmersiveFullscreenForBrowserOnly); diff --git a/ash/ash_switches.h b/ash/ash_switches.h index fe75d1a..7cae7aa 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -27,7 +27,6 @@ ASH_EXPORT extern const char kAshDefaultWallpaperSmall[]; ASH_EXPORT extern const char kAshDisableAlternateFrameCaptionButtonStyle[]; ASH_EXPORT extern const char kAshDisableAlternateShelfLayout[]; ASH_EXPORT extern const char kAshDisableDockedWindows[]; -ASH_EXPORT extern const char kAshDisableDragOffShelf[]; ASH_EXPORT extern const char kAshDisableOverviewMode[]; ASH_EXPORT extern const char kAshEnableAdvancedGestures[]; ASH_EXPORT extern const char kAshEnableAlternateFrameCaptionButtonStyle[]; diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 6737692..239f155 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -1035,7 +1035,7 @@ void ShelfView::ContinueDrag(const ui::LocatedEvent& event) { // If this is not a drag and drop host operation and not the app list item, // check if the item got ripped off the shelf - if it did we are done. - if (!drag_and_drop_shelf_id_ && ash::switches::UseDragOffShelf() && + if (!drag_and_drop_shelf_id_ && RemovableByRipOff(current_index) != NOT_REMOVABLE) { if (HandleRipOffDrag(event)) return; diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4c2cbbe..8fe33f3 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5545,12 +5545,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION"> Use the alternative shelf layout. </message> - <message name="IDS_FLAGS_DRAG_OFF_SHELF_NAME"> - Dragging off items from shelf to unpin - </message> - <message name="IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION"> - Disable to disallow items to be dragged off the shelf to unpin them. - </message> <message name="IDS_FLAGS_RELAUNCH_BUTTON" desc="Text on a button that restarts Chrome OS when clicked. "> Restart Now </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 5db2371..f4df9ef 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -956,13 +956,6 @@ const Experiment kExperiments[] = { ash::switches::kAshDisableAlternateShelfLayout) }, { - "ash-disable-drag-off-shelf", - IDS_FLAGS_DRAG_OFF_SHELF_NAME, - IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, - kOsCrOS, - SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) - }, - { "ash-disable-docked-windows", IDS_FLAGS_DOCKED_WINDOWS_NAME, IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, |