AppListController now responsible for ensuring app list stays centered.

ui/app_list/views/app_list_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/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 10 matching lines @@
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
 #include "ui/app_list/views/speech_view.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/bubble/bubble_window_targeter.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 78 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
       signin_view_(NULL),
       speech_view_(NULL),
-      animation_observer_(new HideViewAnimationObserver()),
-      screen_to_keep_centered_on_(NULL) {
+      animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
 
   delegate_->AddObserver(this);
   delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
   delegate_->RemoveObserver(this);
   animation_observer_.reset();
   // Remove child views first to ensure no remaining dependencies on delegate_.
   RemoveAllChildViews(true);
 }
 
 void AppListView::InitAsBubbleAttachedToAnchor(
     gfx::NativeView parent,
     PaginationModel* pagination_model,
     views::View* anchor,
     const gfx::Vector2d& anchor_offset,
     views::BubbleBorder::Arrow arrow,
     bool border_accepts_events) {
   SetAnchorView(anchor);
   InitAsBubbleInternal(
       parent, pagination_model, arrow, border_accepts_events, anchor_offset);
-  screen_to_keep_centered_on_ = NULL;
 }
 
 void AppListView::InitAsBubbleAtFixedLocation(
     gfx::NativeView parent,
     PaginationModel* pagination_model,
     const gfx::Point& anchor_point_in_screen,
     views::BubbleBorder::Arrow arrow,
     bool border_accepts_events) {
   SetAnchorView(NULL);
   SetAnchorRect(gfx::Rect(anchor_point_in_screen, gfx::Size()));
   InitAsBubbleInternal(
       parent, pagination_model, arrow, border_accepts_events, gfx::Vector2d());
-  screen_to_keep_centered_on_ = NULL;
-}
-
-void AppListView::InitAsBubbleCenteredOnPrimaryDisplay(
-    gfx::NativeView parent,
-    PaginationModel* pagination_model,
-    gfx::Screen* screen_to_keep_centered_on,
-    views::BubbleBorder::Arrow arrow,
-    bool border_accepts_events) {
-  screen_to_keep_centered_on_ = screen_to_keep_centered_on;
-  SetAnchorView(NULL);
-  SetAnchorRect(gfx::Rect(GetCenterPoint(), gfx::Size()));
-  InitAsBubbleInternal(
-      parent, pagination_model, arrow, border_accepts_events, gfx::Vector2d());
 }
 
 void AppListView::SetBubbleArrow(views::BubbleBorder::Arrow arrow) {
   GetBubbleFrameView()->bubble_border()->set_arrow(arrow);
   SizeToContents();  // Recalcuates with new border.
   GetBubbleFrameView()->SchedulePaint();
 }
 
 void AppListView::SetAnchorPoint(const gfx::Point& anchor_point) {
   SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));
 }
 
 void AppListView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   app_list_main_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void AppListView::ShowWhenReady() {
   app_list_main_view_->ShowAppListWhenReady();
 }
 
 void AppListView::Close() {
   app_list_main_view_->Close();
   delegate_->Dismiss();
 }
 
 void AppListView::UpdateBounds() {
-  if (screen_to_keep_centered_on_)
-    SetAnchorRect(gfx::Rect(GetCenterPoint(), gfx::Size()));
   SizeToContents();
 }
 
 gfx::Size AppListView::GetPreferredSize() {
   return app_list_main_view_->GetPreferredSize();
 }
 
 void AppListView::Paint(gfx::Canvas* canvas) {
   views::BubbleDelegateView::Paint(canvas);
   if (g_next_paint_callback) {
@@ skipping 124 matching lines @@
   // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the
   // window manager do not have the SWP_SHOWWINDOW flag set which would cause
   // the border to be shown. See http://crbug.com/231687 .
   GetWidget()->Hide();
 #endif
 
   if (delegate_)
     delegate_->ViewInitialized();
 }
 
-gfx::Point AppListView::GetCenterPoint() {
-  DCHECK(screen_to_keep_centered_on_);
-  gfx::Rect bounds = screen_to_keep_centered_on_->GetPrimaryDisplay().bounds();
-  return bounds.CenterPoint();
-}
-
 void AppListView::OnBeforeBubbleWidgetInit(
     views::Widget::InitParams* params,
     views::Widget* widget) const {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   if (delegate_ && delegate_->ForceNativeDesktop())
     params->native_widget = new views::DesktopNativeWidgetAura(widget);
 #endif
 #if defined(OS_WIN)
   // Windows 7 and higher offer pinning to the taskbar, but we need presence
   // on the taskbar for the user to be able to pin us. So, show the window on
@@ skipping 160 matching lines @@
 #else
   speech_view_->SetVisible(recognizing);
   app_list_main_view_->SetVisible(!recognizing);
 
   // Needs to schedule paint of AppListView itself, to repaint the background.
   GetBubbleFrameView()->SchedulePaint();
 #endif
 }
 
 }  // namespace app_list