Hide ChromeVox Panel in full-screen mode.

chrome/browser/chromeos/accessibility/chromevox_panel.cc

 // Copyright 2015 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/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/window_state.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
 #include "ui/chromeos/accessibility_types.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 38 matching lines @@
       panel_->ExitFullscreen();
   }
 
  private:
   ChromeVoxPanel* panel_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeVoxPanelWebContentsObserver);
 };
 
 ChromeVoxPanel::ChromeVoxPanel(content::BrowserContext* browser_context)
-    : widget_(nullptr), web_view_(nullptr), fullscreen_(false) {
+    : widget_(nullptr), web_view_(nullptr), panel_fullscreen_(false) {
   std::string url("chrome-extension://");
   url += extension_misc::kChromeVoxExtensionId;
   url += kChromeVoxPanelRelativeUrl;
 
   views::WebView* web_view = new views::WebView(browser_context);
   content::WebContents* contents = web_view->GetWebContents();
   web_contents_observer_.reset(
       new ChromeVoxPanelWebContentsObserver(contents, this));
   extensions::SetViewType(contents, extensions::VIEW_TYPE_COMPONENT);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
@@ skipping 39 matching lines @@
   if (!shelf)
     return;
 
   ash::ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager();
   if (shelf_layout_manager)
     shelf_layout_manager->SetChromeVoxPanelHeight(kPanelHeight);
 }
 
 void ChromeVoxPanel::EnterFullscreen() {
   Focus();
-  fullscreen_ = true;
+  panel_fullscreen_ = true;
   UpdateWidgetBounds();
 }
 
 void ChromeVoxPanel::ExitFullscreen() {
+  widget_->Deactivate();
   widget_->widget_delegate()->set_can_activate(false);
-  fullscreen_ = false;
+  panel_fullscreen_ = false;
   UpdateWidgetBounds();
 }
 
 void ChromeVoxPanel::DisableSpokenFeedback() {
   chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
       false, ui::A11Y_NOTIFICATION_NONE);
 }
 
 void ChromeVoxPanel::Focus() {
   widget_->widget_delegate()->set_can_activate(true);
@@ skipping 17 matching lines @@
   return web_view_;
 }
 
 void ChromeVoxPanel::OnDisplayMetricsChanged(const gfx::Display& display,
                                              uint32_t changed_metrics) {
   UpdateWidgetBounds();
 }
 
 void ChromeVoxPanel::UpdateWidgetBounds() {
   gfx::Rect bounds(GetRootWindow()->bounds().size());
-  if (!fullscreen_)
+  if (!panel_fullscreen_)
     bounds.set_height(kPanelHeight);
+
+  // If we're in full-screen mode, give the panel a height of 0 unless
+  // it's active.
+  const aura::Window* fullscreen_window =
+      ash::GetRootWindowController(GetRootWindow())
+          ->GetWindowForFullscreenMode();
+  if (fullscreen_window &&
+      ash::wm::GetWindowState(fullscreen_window)->IsFullscreen() &&

[xiyuan, 2016/03/30 16:08:02]

nit: Is checking IsFullscreen() necessary? |fullscreen_window| is returned from
GetWindowForFullscreenMode(). It must be in full screen state if it is not null.

[dmazzoni, 2016/03/31 15:25:56]

Ah, thanks. I misinterpreted and thought it returned the window that should
become full screen too.

+      !widget_->IsActive()) {
+    bounds.set_height(0);
+  }
+
   widget_->SetBounds(bounds);
 }