[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/app_list/app_list_switches.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/app_list_switches.h"
 
 #include "base/command_line.h"
 
 namespace app_list {
 namespace switches {
@@ skipping 13 matching lines @@
 // If set, the experimental app list position will be used.
 const char kEnableExperimentalAppListPosition[] =
     "enable-experimental-app-list-position";
 
 // If set, it will always listen to the audio locally and open the app-list
 // when the hotword is recognized.
 const char kEnableHotwordAlwaysOn[] = "enable-app-list-hotword-always-on";
 
 // Folder UI is enabled by default.
 bool IsFolderUIEnabled() {
+  return true;
 #if !defined(OS_MACOSX)
   return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableFolderUI);
 #else
   return false;
 #endif
 }
 
 bool IsVoiceSearchEnabled() {
   // Speech recognition in AppList is only for ChromeOS right now.
 #if defined(OS_CHROMEOS)
@@ skipping 22 matching lines @@
 }
 
 bool IsExperimentalAppListPositionEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
              kEnableExperimentalAppListPosition) ||
          IsExperimentalAppListEnabled();
 }
 
 }  // namespace switches
 }  // namespace app_list