| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index 697ac3a65f6dccddbea3796e77071d6675f654b1..791779c2c78304e47eab95d311cccf6462e9c6ac 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -596,7 +596,7 @@ void BrowserView::ShowInactive() {
|
| }
|
|
|
| void BrowserView::SetBounds(const gfx::Rect& bounds) {
|
| - SetFullscreen(false);
|
| + SetFullscreen(false, GURL(), false);
|
| GetWidget()->SetBounds(bounds);
|
| }
|
|
|
| @@ -757,12 +757,12 @@ bool BrowserView::IsMinimized() const {
|
| return frame_->IsMinimized();
|
| }
|
|
|
| -void BrowserView::SetFullscreen(bool fullscreen) {
|
| +void BrowserView::SetFullscreen(bool fullscreen, const GURL& url, bool show_buttons) {
|
| if (IsFullscreen() == fullscreen)
|
| return; // Nothing to do.
|
|
|
| -#if defined(OS_WIN) && !defined(USE_AURA)
|
| - ProcessFullscreen(fullscreen);
|
| +#if defined(OS_WIN)
|
| + ProcessFullscreen(fullscreen, url, show_buttons);
|
| #else
|
| // On Linux changing fullscreen is async. Ask the window to change it's
|
| // fullscreen state, and when done invoke ProcessFullscreen.
|
| @@ -779,7 +779,7 @@ bool BrowserView::IsFullscreenBubbleVisible() const {
|
| }
|
|
|
| void BrowserView::FullScreenStateChanged() {
|
| - ProcessFullscreen(IsFullscreen());
|
| + ProcessFullscreen(IsFullscreen(), GURL(), false);
|
| }
|
|
|
| void BrowserView::RestoreFocus() {
|
| @@ -2181,7 +2181,7 @@ bool BrowserView::UpdateChildViewAndLayout(views::View* new_view,
|
| return changed;
|
| }
|
|
|
| -void BrowserView::ProcessFullscreen(bool fullscreen) {
|
| +void BrowserView::ProcessFullscreen(bool fullscreen, const GURL& url, bool show_buttons) {
|
| // 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
|
| @@ -2231,7 +2231,9 @@ void BrowserView::ProcessFullscreen(bool fullscreen) {
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
|
| if (!is_kiosk) {
|
| fullscreen_bubble_.reset(new FullscreenExitBubbleViews(GetWidget(),
|
| - browser_.get()));
|
| + browser_.get(),
|
| + url,
|
| + show_buttons));
|
| }
|
| } else {
|
| #if defined(OS_WIN) && !defined(USE_AURA)
|
| @@ -2251,7 +2253,6 @@ void BrowserView::ProcessFullscreen(bool fullscreen) {
|
| #endif
|
| }
|
|
|
| -
|
| void BrowserView::LoadAccelerators() {
|
| #if defined(USE_AURA)
|
| // TODO(beng):
|
|
|