ChromeOS: Avoid overlapping app list with virtual keyboard.

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 341 matching lines @@
   // 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();

[tapted, 2014/04/29 03:39:17]

Can we just center in the WorkArea rather than bounds()?

shelf_layout_manager.cc seems to subtract the keyboard from the work area around
line 842.

i.e. just a 1-line change here:

gfx::Rect bounds = screen_to_keep_centered_on_->GetPrimaryDisplay().work_area();

[Matt Giuca, 2014/04/29 05:51:35]

Hmm... unfortunately it looks like the order is wrong. If I make this change,
the app list doesn't move when opening the keyboard. But it does move upwards on
subsequent updates (like closing the keyboard). Basically,
AppListView::UpdateBounds is being called before
ShelfLayoutManager::CalculateTargetBounds.

I've had a look at the stack traces, and they don't have a lot in common (it
won't be easy to change this order around). I think we should just stick with
the code I had. (Pity, it was a good suggestion.)

[tapted, 2014/04/29 06:09:53]

Drat. Maybe a short note here like

  // Can't use Display::work_area() because it is updated after UpdateBounds().

[Matt Giuca, 2014/04/29 06:26:11]

Done.

+
+  // If the virtual keyboard is active, subtract it from the display bounds, so
+  // that the app list is centered in the non-keyboard area of the display.
+  gfx::Rect keyboard_bounds = delegate_->GetVirtualKeyboardBounds();
+  if (!keyboard_bounds.IsEmpty())
+    bounds.Subtract(keyboard_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
@@ skipping 163 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