Enable folder feature for app launcher by default.

BUG=345097
R=abodenha@chromium.org, skuhne@chromium.org, xiyuan@chromium.org, zea@chromium.org

Review URL: https://codereview.chromium.org/174243004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253200 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 7 deletions

diff --git a/ui/app_list/app_list_model_unittest.cc b/ui/app_list/app_list_model_unittest.cc
index 865fb12..32d9e81 100644
--- a/ui/app_list/app_list_model_unittest.cc
+++ b/ui/app_list/app_list_model_unittest.cc
@@ -232,7 +232,6 @@ class AppListModelFolderTest : public AppListModelTest {
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
-    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableFolderUI);
     AppListModelTest::SetUp();
   }
   virtual void TearDown() OVERRIDE {
diff --git a/ui/app_list/app_list_switches.cc b/ui/app_list/app_list_switches.cc
index ae14848..211c754 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -12,8 +12,8 @@ namespace switches {
 // If set, the experimental app list will be used.
 const char kEnableExperimentalAppList[] = "enable-experimental-app-list";
 
-// If set, folder will be enabled in app list UI.
-const char kEnableFolderUI[] = "enable-app-list-folder-ui";
+// If set, folder will be disabled in app list UI.
+const char kDisableFolderUI[] = "disable-app-list-folder-ui";
 
 // If set, the voice search is disabled in app list UI.
 const char kDisableVoiceSearch[] = "disable-app-list-voice-search";
@@ -21,8 +21,9 @@ const char kDisableVoiceSearch[] = "disable-app-list-voice-search";
 // If set, the app info context menu item is available in the app list UI.
 const char kEnableAppInfo[] = "enable-app-list-app-info";
 
+// Folder UI is enabled by default.
 bool IsFolderUIEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(kEnableFolderUI);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableFolderUI);
 }
 
 bool IsVoiceSearchEnabled() {
diff --git a/ui/app_list/app_list_switches.h b/ui/app_list/app_list_switches.h
index d792c8f..3e522c6 100644
--- a/ui/app_list/app_list_switches.h
+++ b/ui/app_list/app_list_switches.h
@@ -11,7 +11,7 @@ namespace app_list {
 namespace switches {
 
 APP_LIST_EXPORT extern const char kEnableExperimentalAppList[];
-APP_LIST_EXPORT extern const char kEnableFolderUI[];
+APP_LIST_EXPORT extern const char kDisableFolderUI[];
 APP_LIST_EXPORT extern const char kDisableVoiceSearch[];
 APP_LIST_EXPORT extern const char kEnableAppInfo[];
 
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index 17788e3..4544a5b 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ -15,6 +16,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/views/app_list_item_view.h"
@@ -228,7 +230,8 @@ TEST_F(AppsGridViewTest, RemoveSelectedLastApp) {
   EXPECT_TRUE(apps_grid_view_->IsSelectedView(view));
 }
 
-TEST_F(AppsGridViewTest, MouseDrag) {
+TEST_F(AppsGridViewTest, MouseDragWithFolderDisabled) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableFolderUI);
   const int kTotalItems = 4;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
@@ -317,7 +320,8 @@ TEST_F(AppsGridViewTest, MouseDragFlipPage) {
   apps_grid_view_->EndDrag(true);
 }
 
-TEST_F(AppsGridViewTest, SimultaneousDrag) {
+TEST_F(AppsGridViewTest, SimultaneousDragWithFolderDisabled) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableFolderUI);
   const int kTotalItems = 4;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),