Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/wm/app_list_controller.cc

Index: ash/wm/app_list_controller.cc
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 33b7c8bdd36f9fb6626331db18dfb61d73edfacc..550a9552f2ed350fac518d7943a08484dbca08e0 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -176,6 +176,23 @@
           Shell::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint(),
           views::BubbleBorder::FLOAT,
           true /* border_accepts_events */);
+    } else if (ash::switches::UseAlternateShelfLayout()) {
+      gfx::Rect applist_button_bounds = Shelf::ForWindow(container)->
+          GetAppListButtonView()->GetBoundsInScreen();
+      // We need the location of the button within the local screen.
+      applist_button_bounds = ScreenUtil::ConvertRectFromScreen(
+          root_window,
+          applist_button_bounds);
+      view->InitAsBubbleAttachedToAnchor(
+          container,
+          pagination_model_.get(),
+          Shelf::ForWindow(container)->GetAppListButtonView(),
+          GetAnchorPositionOffsetToShelf(applist_button_bounds,
+              Shelf::ForWindow(container)->GetAppListButtonView()->
+                  GetWidget()),
+          GetBubbleArrow(container),
+          true /* border_accepts_events */);
+      view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
     } else {
       view->InitAsBubbleAttachedToAnchor(
           container,