| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 4ba4c0e2880a74433191f940d5d154a67ba05642..f83d7be48b6dddb8643794a90066a80d8141c649 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -806,7 +806,7 @@ WebContents* Browser::OpenApplicationTab(Profile* profile,
|
| // full screen mode in this case?
|
| if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN &&
|
| !browser->window()->IsFullscreen()) {
|
| - browser->ToggleFullscreenMode(false);
|
| + browser->ToggleFullscreenMode();
|
| }
|
|
|
| return contents;
|
| @@ -1758,14 +1758,17 @@ void Browser::ConvertPopupToTabbedBrowser() {
|
| browser->window()->Show();
|
| }
|
|
|
| -// TODO(koz): Change |for_tab| to an enum.
|
| -void Browser::ToggleFullscreenMode(bool for_tab) {
|
| - fullscreen_controller_->ToggleFullscreenMode(for_tab);
|
| +void Browser::ToggleFullscreenMode() {
|
| + fullscreen_controller_->ToggleFullscreenMode();
|
| +}
|
| +
|
| +void Browser::ToggleFullscreenModeWithExtension(const Extension& extension) {
|
| + fullscreen_controller_->ToggleFullscreenModeWithExtension(extension);
|
| }
|
|
|
| #if defined(OS_MACOSX)
|
| -void Browser::TogglePresentationMode(bool for_tab) {
|
| - fullscreen_controller_->TogglePresentationMode(for_tab);
|
| +void Browser::TogglePresentationMode() {
|
| + fullscreen_controller_->TogglePresentationMode();
|
| }
|
| #endif
|
|
|
| @@ -1773,7 +1776,7 @@ void Browser::TogglePresentationMode(bool for_tab) {
|
| void Browser::Search() {
|
| // Exit fullscreen to show omnibox.
|
| if (window_->IsFullscreen()) {
|
| - ToggleFullscreenMode(false);
|
| + ToggleFullscreenMode();
|
| // ToggleFullscreenMode is asynchronous, so we don't have omnibox
|
| // visible at this point. Wait for next event cycle which toggles
|
| // the visibility of omnibox before creating new tab.
|
| @@ -2866,9 +2869,9 @@ void Browser::ExecuteCommandWithDisposition(
|
| case IDC_RESTORE_TAB: RestoreTab(); break;
|
| case IDC_COPY_URL: WriteCurrentURLToClipboard(); break;
|
| case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break;
|
| - case IDC_FULLSCREEN: ToggleFullscreenMode(false); break;
|
| + case IDC_FULLSCREEN: ToggleFullscreenMode(); break;
|
| #if defined(OS_MACOSX)
|
| - case IDC_PRESENTATION_MODE: TogglePresentationMode(false); break;
|
| + case IDC_PRESENTATION_MODE: TogglePresentationMode(); break;
|
| #endif
|
| case IDC_EXIT: Exit(); break;
|
| #if defined(OS_CHROMEOS)
|
|
|