Show ChromeVox caption panel when spoken feedback is enabled.

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 346 matching lines @@
     views::Widget* widget) {
   // Use translucent-style window frames for dialogs.
   return new CustomFrameViewAsh(widget);
 }
 
 void Shell::RotateFocus(Direction direction) {
   focus_cycler_->RotateFocus(direction == FORWARD ? FocusCycler::FORWARD
                                                   : FocusCycler::BACKWARD);
 }
 
-void Shell::SetDisplayWorkAreaInsets(Window* contains,
-                                     const gfx::Insets& insets) {
+void Shell::UpdateDisplayWorkAreaInsets(Window* root_window) {
+  gfx::Insets shelf_insets =
+      ash::ShelfLayoutManager::ForShelf(root_window)->GetWorkAreaInsets();
+  gfx::Insets accessibility_insets =
+      accessibility_delegate_->GetWorkAreaInsets(root_window);
+  gfx::Insets merged_insets = gfx::Insets(
+      std::max(shelf_insets.top(), accessibility_insets.top()),
+      std::max(shelf_insets.left(), accessibility_insets.left()),
+      std::max(shelf_insets.bottom(), accessibility_insets.bottom()),
+      std::max(shelf_insets.right(), accessibility_insets.right()));
+
   if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow(
-          contains, insets)) {
+          root_window, merged_insets)) {
     return;
   }
   FOR_EACH_OBSERVER(ShellObserver, observers_,
                     OnDisplayWorkAreaInsetsChanged());
 }
 
 void Shell::OnLoginStateChanged(user::LoginStatus status) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLoginStateChanged(status));
 }
 
@@ skipping 788 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash