Fix experimental app list search box disappearing on profile switch.

ui/app_list/views/contents_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/contents_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 448 matching lines @@
   gfx::Rect search_box_bounds = GetDefaultSearchBoxBounds();
   gfx::Rect default_contents_bounds = GetDefaultContentsBounds();
   gfx::Vector2d bottom_right =
       search_box_bounds.bottom_right().OffsetFromOrigin();
   bottom_right.SetToMax(
       default_contents_bounds.bottom_right().OffsetFromOrigin());
   return gfx::Size(bottom_right.x(), bottom_right.y());
 }
 
 void ContentsView::Layout() {
-  // The search box is contained in a widget so set the bounds of the widget
-  // rather than the SearchBoxView. In athena, the search box widget will be the
-  // same as the app list widget so don't move it.
-  views::Widget* search_box_widget = GetSearchBoxView()->GetWidget();
-  if (search_box_widget && search_box_widget != GetWidget()) {
-    gfx::Rect search_box_bounds = GetSearchBoxBoundsForState(GetActiveState());
-    search_box_widget->SetBounds(ConvertRectToWidget(
-        GetSearchBoxView()->GetViewBoundsForSearchBoxContentsBounds(
-            search_box_bounds)));
-  }
-
   // Immediately finish all current animations.
   pagination_model_.FinishAnimation();
 
   // Move the current view onto the screen, and all other views off screen to
   // the left. (Since we are not animating, we don't need to be careful about
   // which side we place the off-screen views onto.)
   gfx::Rect rect = GetOnscreenPageBounds(GetActivePageIndex());
   double progress =
       IsStateActive(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE) ? 1 : 0;
 
@@ skipping 14 matching lines @@
         ->SetBoundsRect(i == current_page ? rect : offscreen_target);
   }
 
   // Custom locations of pages in certain states.
   // Within the start page, the custom page is given its collapsed bounds.
   int start_page_index = GetPageIndexForState(AppListModel::STATE_START);
   if (current_page == start_page_index) {
     if (custom_page_view_)
       custom_page_view_->SetBoundsRect(GetCustomPageCollapsedBounds());
   }
+
+  // The search box is contained in a widget so set the bounds of the widget
+  // rather than the SearchBoxView. In athena, the search box widget will be the
+  // same as the app list widget so don't move it.
+  views::Widget* search_box_widget = GetSearchBoxView()->GetWidget();
+  if (search_box_widget && search_box_widget != GetWidget()) {
+    gfx::Rect search_box_bounds = GetSearchBoxBoundsForState(GetActiveState());
+    search_box_widget->SetBounds(ConvertRectToWidget(
+        GetSearchBoxView()->GetViewBoundsForSearchBoxContentsBounds(
+            search_box_bounds)));
+  }
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
   bool handled =
       view_model_->view_at(GetActivePageIndex())->OnKeyPressed(event);
 
   if (!handled) {
     if (event.key_code() == ui::VKEY_TAB && event.IsShiftDown()) {
       GetSearchBoxView()->MoveTabFocus(true);
       handled = true;
@@ skipping 23 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list