diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 04:59:28 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 04:59:28 +0000 |
| commit | a28b50cc6408724ce2175454501ad539f20ded3a (patch) | |
| tree | 1ecec0261d0c1b902a76af07a85c42a7726568c2 /ash/launcher | |
| parent | 11f22bb6b28d12b339317525c7fe8286fb6443b1 (diff) | |
| download | chromium_src-a28b50cc6408724ce2175454501ad539f20ded3a.zip chromium_src-a28b50cc6408724ce2175454501ad539f20ded3a.tar.gz chromium_src-a28b50cc6408724ce2175454501ad539f20ded3a.tar.bz2 | |
Disable the moveable app list icon.
BUG=297043
Review URL: https://chromiumcodereview.appspot.com/23714012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 5 | ||||
| -rw-r--r-- | ash/launcher/launcher_view_unittest.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index cf6b504..3491b1b 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -1193,11 +1193,10 @@ LauncherView::RemovableState LauncherView::RemovableByRipOff(int index) { bool LauncherView::SameDragType(LauncherItemType typea, LauncherItemType typeb) const { switch (typea) { - case TYPE_APP_LIST: case TYPE_APP_SHORTCUT: case TYPE_BROWSER_SHORTCUT: - return (typeb == TYPE_APP_SHORTCUT || typeb == TYPE_BROWSER_SHORTCUT || - typeb == TYPE_APP_LIST); + return (typeb == TYPE_APP_SHORTCUT || typeb == TYPE_BROWSER_SHORTCUT); + case TYPE_APP_LIST: case TYPE_PLATFORM_APP: case TYPE_WINDOWED_APP: case TYPE_APP_PANEL: diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index 820f94a..4fc7d7a 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -470,14 +470,14 @@ TEST_F(LauncherViewTest, EnforceDragType) { TYPE_BROWSER_SHORTCUT)); EXPECT_FALSE(test_api_->SameDragType(TYPE_APP_SHORTCUT, TYPE_WINDOWED_APP)); - EXPECT_TRUE(test_api_->SameDragType(TYPE_APP_SHORTCUT, TYPE_APP_LIST)); + EXPECT_FALSE(test_api_->SameDragType(TYPE_APP_SHORTCUT, TYPE_APP_LIST)); EXPECT_FALSE(test_api_->SameDragType(TYPE_APP_SHORTCUT, TYPE_APP_PANEL)); EXPECT_TRUE(test_api_->SameDragType(TYPE_BROWSER_SHORTCUT, TYPE_BROWSER_SHORTCUT)); EXPECT_FALSE(test_api_->SameDragType(TYPE_BROWSER_SHORTCUT, TYPE_WINDOWED_APP)); - EXPECT_TRUE(test_api_->SameDragType(TYPE_BROWSER_SHORTCUT, TYPE_APP_LIST)); + EXPECT_FALSE(test_api_->SameDragType(TYPE_BROWSER_SHORTCUT, TYPE_APP_LIST)); EXPECT_FALSE(test_api_->SameDragType(TYPE_BROWSER_SHORTCUT, TYPE_APP_PANEL)); EXPECT_TRUE(test_api_->SameDragType(TYPE_WINDOWED_APP, TYPE_WINDOWED_APP)); |