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

ui/app_list/views/apps_grid_view.h

Index: ui/app_list/views/apps_grid_view.h
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index 20374441808d89268b0c88cd6d16ee1a90de02e3..f73075aacb018bc76915c7fe27bede676e976104 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -15,6 +15,7 @@
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/pagination_model_observer.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/models/list_model_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ -69,6 +70,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
     TOUCH,
   };
 
+  static const char kViewClassName[];
+
   // Constructs the app icon grid view. |delegate| is the delegate of this
   // view, which usually is the hosting AppListView. |pagination_model| is
   // the paging info shared within the launcher UI.
@@ -132,6 +135,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
   bool dragging() const { return drag_pointer_ != NONE; }
 
   // Overridden from views::View:
+  virtual const char* GetClassName() const OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
@@ -140,8 +144,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
       const ViewHierarchyChangedDetails& details) OVERRIDE;
   virtual bool GetDropFormats(
       int* formats,
-      std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
-  virtual bool CanDrop(const OSExchangeData& data) OVERRIDE;
+      std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
 
   // Stops the timer that triggers a page flip during a drag.