Implement fullscreen info bubble on Win and Mac

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 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/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 571 matching lines @@
 
   browser()->OnWindowDidShow();
 }
 
 void BrowserView::ShowInactive() {
   if (!frame_->IsVisible())
     frame_->ShowInactive();
 }
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
-  SetFullscreen(false);
+  SetFullscreen(false, GURL(), false);
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
   BrowserBubbleHost::Close();
 
   frame_->Close();
 }
 
 void BrowserView::Activate() {
@@ skipping 140 matching lines @@
 }
 
 bool BrowserView::IsMaximized() const {
   return frame_->IsMaximized();
 }
 
 bool BrowserView::IsMinimized() const {
   return frame_->IsMinimized();
 }
 
-void BrowserView::SetFullscreen(bool fullscreen) {
+void BrowserView::SetFullscreen(bool fullscreen, const GURL& url,

[Peter Kasting, 2011/10/11 23:08:32]

Nit: One arg per line, aligned

[koz (OOO until 15th September), 2011/10/12 05:38:23]

Done.

+    bool ask_permission) {
   if (IsFullscreen() == fullscreen)
     return;  // Nothing to do.
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  ProcessFullscreen(fullscreen);
+#if defined(OS_WIN)
+  ProcessFullscreen(fullscreen, url, ask_permission);
 #else
   // On Linux changing fullscreen is async. Ask the window to change it's
   // fullscreen state, and when done invoke ProcessFullscreen.
   frame_->SetFullscreen(fullscreen);
 #endif
 }
 
 bool BrowserView::IsFullscreen() const {
   return frame_->IsFullscreen();
 }
 
 bool BrowserView::IsFullscreenBubbleVisible() const {
   return fullscreen_bubble_.get() ? true : false;
 }
 
 void BrowserView::FullScreenStateChanged() {
-  ProcessFullscreen(IsFullscreen());
+  ProcessFullscreen(IsFullscreen(), GURL(), false);
 }
 
 void BrowserView::RestoreFocus() {
   TabContents* selected_tab_contents = GetSelectedTabContents();
   if (selected_tab_contents)
     selected_tab_contents->view()->RestoreFocus();
 }
 
 LocationBar* BrowserView::GetLocationBar() const {
   return GetLocationBarView();
@@ skipping 1373 matching lines @@
   } else if (new_view) {
     DCHECK_EQ(0, new_height);
     // The heights are the same, but the old view is null. This only happens
     // when the height is zero. Zero out the bounds.
     new_view->SetBounds(0, 0, 0, 0);
   }
   *old_view = new_view;
   return changed;
 }
 
-void BrowserView::ProcessFullscreen(bool fullscreen) {
+void BrowserView::ProcessFullscreen(bool fullscreen, const GURL& url,

[Peter Kasting, 2011/10/11 23:08:32]

Nit: One arg per line, aligned

[koz (OOO until 15th September), 2011/10/12 05:38:23]

Done.

+    bool ask_permission) {
   // Reduce jankiness during the following position changes by:
   //   * Hiding the window until it's in the final position
   //   * Ignoring all intervening Layout() calls, which resize the webpage and
   //     thus are slow and look ugly
   ignore_layout_ = true;
   LocationBarView* location_bar = GetLocationBarView();
 #if defined(OS_WIN) && !defined(USE_AURA)
   OmniboxViewWin* omnibox_view =
       static_cast<OmniboxViewWin*>(location_bar->location_entry());
 #endif
@@ skipping 29 matching lines @@
 #endif  // No need to invoke SetFullscreen for linux as this code is executed
         // once we're already fullscreen on linux.
 
   browser_->WindowFullscreenStateChanged();
 
   if (fullscreen) {
     bool is_kiosk =
         CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
     if (!is_kiosk) {
       fullscreen_bubble_.reset(new FullscreenExitBubbleViews(GetWidget(),
-                                                             browser_.get()));
+                                                             browser_.get(),

[Peter Kasting, 2011/10/11 23:08:32]

Nit: I'd just put all these on one line and indent 4

[koz (OOO until 15th September), 2011/10/12 05:38:23]

Done.

+                                                             url,
+                                                             ask_permission));
     }
   } else {
 #if defined(OS_WIN) && !defined(USE_AURA)
     // Show the edit again since we're no longer in fullscreen mode.
     omnibox_view->set_force_hidden(false);
     ShowWindow(omnibox_view->m_hWnd, SW_SHOW);
 #endif
   }
 
   // Undo our anti-jankiness hacks and force the window to re-layout now that
   // it's in its final position.
   ignore_layout_ = false;
   Layout();
 #if defined(OS_WIN) && !defined(USE_AURA)
   static_cast<views::NativeWidgetWin*>(frame_->native_widget())->
       PopForceHidden();
 #endif
 }
 
-
 void BrowserView::LoadAccelerators() {
 #if defined(USE_AURA)
   // TODO(beng):
   NOTIMPLEMENTED();
 #elif defined(OS_WIN)
   HACCEL accelerator_table = AtlLoadAccelerators(IDR_MAINFRAME);
   DCHECK(accelerator_table);
 
   // We have to copy the table to access its contents.
   int count = CopyAcceleratorTable(accelerator_table, 0, 0);
@@ skipping 307 matching lines @@
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
   gfx::Rect bounds;
   bounds.set_origin(origin);
 
   AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get());
   // Bubble::Show() takes ownership of the view.
   Bubble::Show(this->GetWidget(), bounds,
                views::BubbleBorder::TOP_RIGHT,
                bubble_view, bubble_view);
 }