Fix use-after-free when switching profiles in the experimental app list.

ui/app_list/views/app_list_main_view.h

Index: ui/app_list/views/app_list_main_view.h
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 9737d7f2fc5bf9eb59b714bfb324dc153f71222e..20ea8076b7f80639097ffc0396b8a251f784ad2b 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -27,6 +27,7 @@ class AppListModel;
 class AppListViewDelegate;
 class ApplicationDragAndDropHost;
 class ContentsView;
+class ContentsSwitcherView;
 class PaginationModel;
 class SearchBoxView;
 
@@ -65,6 +66,9 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
       ApplicationDragAndDropHost* drag_and_drop_host);
 
   ContentsView* contents_view() const { return contents_view_; }
+  ContentsSwitcherView* contents_switcher_view() const {
+    return contents_switcher_view_;
+  }
   AppListModel* model() { return model_; }
 
   // Returns true if the app list should be centered and in landscape mode.
@@ -109,6 +113,7 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
 
   SearchBoxView* search_box_view_;  // Owned by views hierarchy.
   ContentsView* contents_view_;  // Owned by views hierarchy.
+  ContentsSwitcherView* contents_switcher_view_;  // Owned by views hierarchy.

[Matt Giuca, 2014/06/17 05:49:26]

Add that it can be NULL.

[calamity, 2014/06/17 09:15:39]

Done.

 
   // A timer that fires when maximum allowed time to wait for icon loading has
   // passed.