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

ui/app_list/views/apps_grid_view.cc

Index: ui/app_list/views/apps_grid_view.cc
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index 516223a94afce0400ba9a0b518f46c2aec8c113a..64bc924bd57d267b9b3d89fbc7c2cf7437aaafcc 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -17,11 +17,12 @@
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
-#include "ui/app_list/views/app_list_folder_view.h"
+//#include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_grid_view_delegate.h"
+#include "ui/app_list/views/apps_grid_view_folder_delegate.h"
 #include "ui/app_list/views/page_switcher.h"
-#include "ui/app_list/views/pulsing_block_view.h"
+//#include "ui/app_list/views/pulsing_block_view.h"
 #include "ui/app_list/views/top_icon_animation_view.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
@@ -312,6 +313,8 @@ class SynchronousDrag : public ui::DragSourceWin {
 };
 #endif  // defined(OS_WIN)
 
+const char AppsGridView::kViewClassName[] = "AppsGridView";
+
 AppsGridView::AppsGridView(AppsGridViewDelegate* delegate,
                            PaginationModel* pagination_model)
     : model_(NULL),
@@ -335,7 +338,9 @@ AppsGridView::AppsGridView(AppsGridViewDelegate* delegate,
       activated_item_view_(NULL),
       dragging_for_reparent_item_(false),
       weak_factory_(this) {
+#if defined(USE_AURA)
   SetPaintToLayer(true);
+#endif
   SetFillsBoundsOpaquely(false);
 
   pagination_model_->AddObserver(this);
@@ -773,6 +778,10 @@ void AppsGridView::Prerender(int page_index) {
   }
 }
 
+const char* AppsGridView::GetClassName() const {
+  return kViewClassName;
+}
+
 gfx::Size AppsGridView::GetPreferredSize() {
   const gfx::Insets insets(GetInsets());
   const gfx::Size tile_size = gfx::Size(kPreferredTileWidth,
@@ -883,6 +892,7 @@ void AppsGridView::Update() {
   view_model_.Clear();
   if (!item_list_ || !item_list_->item_count())
     return;
+  DLOG(INFO) << "AppsGridView::Update(n=" << item_list_->item_count() << ")";
   for (size_t i = 0; i < item_list_->item_count(); ++i) {
     views::View* view = CreateViewForItemAtIndex(i);
     view_model_.Add(view, i);
@@ -919,10 +929,13 @@ void AppsGridView::UpdatePulsingBlockViews() {
   }
 
   while (pulsing_blocks_model_.view_size() < desired) {
+    NOTREACHED();
+#ifdef FIXME
     views::View* view = new PulsingBlockView(
         gfx::Size(kPreferredTileWidth, kPreferredTileHeight), true);
     pulsing_blocks_model_.Add(view, 0);
     AddChildView(view);
+#endif
   }
 }
 
@@ -1289,7 +1302,6 @@ void AppsGridView::OnFolderItemReparentTimer() {
   DCHECK(folder_delegate_);
   if (drag_out_of_folder_container_) {
     folder_delegate_->ReparentItem(drag_view_, last_drag_point_);
-
     // Set the flag in the folder's grid view.
     dragging_for_reparent_item_ = true;