Follow-ups/Tweaks for Embedded Flash Fullscreen.

chrome/browser/ui/fullscreen/fullscreen_controller.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 "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 265 matching lines @@
   reentrant_window_state_change_call_check_ = true;
 
   bool exiting_fullscreen = !window_->IsFullscreen();
 
   PostFullscreenChangeNotification(!exiting_fullscreen);
   if (exiting_fullscreen) {
     toggled_into_fullscreen_ = false;
     extension_caused_fullscreen_ = GURL();
     NotifyTabOfExitIfNecessary();
   }
-  if (exiting_fullscreen)
+  if (exiting_fullscreen) {
     window_->GetDownloadShelf()->Unhide();
-  else
+  } else {
     window_->GetDownloadShelf()->Hide();
+    if (window_->GetStatusBubble())
+      window_->GetStatusBubble()->Hide();
+  }
 }
 
 bool FullscreenController::HandleUserPressedEscape() {
   if (IsFullscreenForTabOrPending() ||
       IsMouseLocked() || IsMouseLockRequested()) {
     ExitTabFullscreenOrMouseLockIfNecessary();
     return true;
   }
 
   return false;
@@ skipping 117 matching lines @@
 #if !defined(OS_MACOSX)  // App mode (kiosk) is not available on Mac yet.
   app_mode = chrome::IsRunningInAppMode();
 #endif
 
   if (mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY) {
     return FEB_TYPE_NONE;
   }
 
   if (fullscreened_tab_) {
     if (tab_fullscreen_accepted_) {
-      if (IsMouseLocked()) {
+      if (IsPrivilegedFullscreenForTab()) {
+        return FEB_TYPE_NONE;
+      } else if (IsMouseLocked()) {
         return FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION;
       } else if (IsMouseLockRequested()) {
         return FEB_TYPE_MOUSELOCK_BUTTONS;
       } else {
         return FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION;
       }
     } else {  // Full screen not yet accepted.
       if (IsMouseLockRequested()) {
         return FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS;
       } else {
@@ skipping 255 matching lines @@
       (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?
       mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;
   if (!mouse_lock_view) {
     RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();
     if (rvh)
       mouse_lock_view = rvh->GetView();
   }
   if (mouse_lock_view)
     mouse_lock_view->UnlockMouse();
 }