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

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: yzshen feedback addressed. Created 8 years, 8 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
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 16cda189b7fd4d1c60b0045ee94df875e5611b58..c73fc4f65f4fb42f3db79d1c08b7938e1eb90ec8 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -833,8 +833,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 {

Powered by Google App Engine
This is Rietveld 408576698