diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-23 23:14:53 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-23 23:14:53 +0000 |
| commit | 2a490dadb7a0c9b85d3729e6caee6096482477e9 (patch) | |
| tree | 3f502f08ad2e96ded322067793a1d58d62c0586f /chrome/browser/views/frame/browser_view.cc | |
| parent | 01eb05b0f9f605754a712a483678f781e99bb2a8 (diff) | |
| download | chromium_src-2a490dadb7a0c9b85d3729e6caee6096482477e9.zip chromium_src-2a490dadb7a0c9b85d3729e6caee6096482477e9.tar.gz chromium_src-2a490dadb7a0c9b85d3729e6caee6096482477e9.tar.bz2 | |
Revert "Revert "Fullscreen mode UI.""
This reverts commit 243e461e4a659a6e8008befc2c76a55680860f01.
Review URL: http://codereview.appspot.com/21057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame/browser_view.cc')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index b2fbe13a..c0476d5 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -22,6 +22,7 @@ #include "chrome/browser/views/clear_browsing_data.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/browser/views/frame/browser_frame.h" +#include "chrome/browser/views/fullscreen_exit_bubble.h" #include "chrome/browser/views/html_dialog_view.h" #include "chrome/browser/views/importer_view.h" #include "chrome/browser/views/infobars/infobar_container.h" @@ -577,7 +578,9 @@ void BrowserView::SetFullscreen(bool fullscreen) { if (bookmark_bar_view_.get()) bookmark_bar_view_->OnFullscreenToggled(fullscreen_); - HWND hwnd = GetWidget()->GetHWND(); + // Size/position/style window appropriately. + views::Widget* widget = GetWidget(); + HWND hwnd = widget->GetHWND(); gfx::Rect new_rect; if (fullscreen_) { // Save current window information. @@ -605,6 +608,10 @@ void BrowserView::SetFullscreen(bool fullscreen) { // This will cause the window to re-layout. SetWindowPos(hwnd, NULL, new_rect.x(), new_rect.y(), new_rect.width(), new_rect.height(), SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); + + // Turn fullscreen bubble on or off. + fullscreen_bubble_.reset(fullscreen_ ? + new FullscreenExitBubble(widget, browser_.get()) : NULL); } bool BrowserView::IsFullscreen() const { |