Disable folder UI when app sync is disabled

ui/app_list/views/app_list_item_view.cc

 // Copyright (c) 2012 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/views/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
-#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/cached_label.h"
 #include "ui/app_list/views/progress_bar_view.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 311 matching lines @@
     return;
 
   gfx::Rect rect(GetContentsBounds());
   if (item_->highlighted() && !item_->is_installing()) {
     canvas->FillRect(rect, kHighlightedColor);
     return;
   } else if (apps_grid_view_->IsSelectedView(this)) {
       canvas->FillRect(rect, kSelectedColor);
   }
 
-  if (!switches::IsFolderUIEnabled()) {
+  if (!apps_grid_view_->model()->folders_enabled()) {
     if (apps_grid_view_->IsSelectedView(this)) {
       canvas->FillRect(rect, kSelectedColor);
     } else if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
       canvas->FillRect(rect, kHighlightedColor);
     }
   } else if (ui_state_ == UI_STATE_DROPPING_IN_FOLDER) {
     // Draw folder dropping preview circle.
     gfx::Point center = gfx::Point(icon_->x() + icon_->size().width() / 2,
                                    icon_->y() + icon_->size().height() / 2);
     SkPaint paint;
@@ skipping 17 matching lines @@
                                       gfx::Rect(point, gfx::Size()),
                                       views::MENU_ANCHOR_TOPLEFT,
                                       source_type,
                                       views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED) {
     return;
   }
 }
 
 void AppListItemView::StateChanged() {
-  const bool is_folder_ui_enabled = switches::IsFolderUIEnabled();
+  const bool is_folder_ui_enabled = apps_grid_view_->model()->folders_enabled();
   if (is_folder_ui_enabled)
     apps_grid_view_->ClearAnySelectedView();
 
   if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
     if (!is_folder_ui_enabled)
       apps_grid_view_->SetSelectedView(this);
     title_->SetEnabledColor(kGridTitleHoverColor);
   } else {
     if (!is_folder_ui_enabled)
       apps_grid_view_->ClearSelectedView(this);
@@ skipping 133 matching lines @@
   const int left_right_padding =
       title_->font_list().GetExpectedTextWidth(kLeftRightPaddingChars);
   rect.Inset(left_right_padding, kTopPadding, left_right_padding, 0);
 
   gfx::Rect icon_bounds(rect.x(), rect.y(), rect.width(), icon_size_.height());
   icon_bounds.Inset(gfx::ShadowValue::GetMargin(icon_shadows_));
   return icon_bounds;
 }
 
 }  // namespace app_list