Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6155)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10261011: Windowed mode mouse lock addded to fullscreen controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build bot errors Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/fullscreen_controller.cc ('K') | « chrome/browser/ui/gtk/browser_window_gtk.cc ('k') | chrome/common/chrome_notification_types.h » ('j') | chrome/common/chrome_notification_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cafd5fb1b2964d862eae6d26c0735df0b64b8602..6e1c634a82c4e01a0061ef5063564e313d080c1e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -768,8 +768,14 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateFullscreenExitBubbleContent(
const GURL& url,
FullscreenExitBubbleType bubble_type) {
- if (fullscreen_bubble_.get())
+ if (bubble_type == FEB_TYPE_NONE) {
+ fullscreen_bubble_.reset();
+ } else if (fullscreen_bubble_.get()) {
fullscreen_bubble_->UpdateContent(url, bubble_type);
+ } else {
+ fullscreen_bubble_.reset(new FullscreenExitBubbleViews(
+ GetWidget(), browser_.get(), url, bubble_type));
+ }
}
bool BrowserView::IsFullscreen() const {
« chrome/browser/ui/fullscreen_controller.cc ('K') | « chrome/browser/ui/gtk/browser_window_gtk.cc ('k') | chrome/common/chrome_notification_types.h » ('j') | chrome/common/chrome_notification_types.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698