Index: chrome/browser/ui/browser.cc |
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
index 4e9428fea59e4dcb3ce2141103c97ed2112d7443..0b299f3ba6c03a1b506a5de18f1855c35c03d9dd 100644 |
--- a/chrome/browser/ui/browser.cc |
+++ b/chrome/browser/ui/browser.cc |
@@ -1773,22 +1773,15 @@ void Browser::NotifyTabOfFullscreenExitIfNecessary() { |
void Browser::TogglePresentationMode(bool for_tab) { |
bool entering_fullscreen = !window_->InPresentationMode(); |
GURL url; |
- bool ask_permission = false; |
if (for_tab) { |
url = GetSelectedTabContents()->GetURL(); |
- ask_permission = GetFullscreenSetting(url) != CONTENT_SETTING_ALLOW; |
- } |
- if (entering_fullscreen) { |
- FullscreenExitBubbleType type = |
- FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION; |
- if (for_tab) { |
- type = ask_permission ? FEB_TYPE_FULLSCREEN_BUTTONS : |
- FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION; |
- } |
- window_->EnterPresentationMode(url, type); |
- } else { |
- window_->ExitPresentationMode(); |
+ tab_fullscreen_accepted_ = entering_fullscreen && |
+ GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW; |
} |
+ if (entering_fullscreen) |
+ window_->EnterPresentationMode(url, GetFullscreenExitBubbleType()); |
+ else |
+ window_->ExitPresentationMode(); |
WindowFullscreenStateChanged(); |
} |
#endif |