| Index: chrome/browser/browser.cc
|
| diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
|
| index 30a7a01bdc44c9f8084b202656ac8994d3f3b135..27e14232790266c45534d8396fef54cf7c8b7a60 100644
|
| --- a/chrome/browser/browser.cc
|
| +++ b/chrome/browser/browser.cc
|
| @@ -921,6 +921,14 @@ void Browser::ConvertPopupToTabbedBrowser() {
|
| }
|
|
|
| void Browser::ToggleFullscreenMode() {
|
| +#if !defined(OS_MACOSX)
|
| + // In kiosk mode, we always want to be fullscreen. When the browser first
|
| + // starts we're not yet fullscreen, so let the initial toggle go through.
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
|
| + window_->IsFullscreen())
|
| + return;
|
| +#endif
|
| +
|
| UserMetrics::RecordAction(L"ToggleFullscreen", profile_);
|
| window_->SetFullscreen(!window_->IsFullscreen());
|
| // On Linux, setting fullscreen mode is an async call to the X server, which
|
| @@ -2644,6 +2652,11 @@ void Browser::RemoveScheduledUpdatesFor(TabContents* contents) {
|
| // Browser, Getters for UI (private):
|
|
|
| StatusBubble* Browser::GetStatusBubble() {
|
| +#if !defined(OS_MACOSX)
|
| + // In kiosk mode, we want to always hide the status bubble.
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
|
| + return NULL;
|
| +#endif
|
| return window_ ? window_->GetStatusBubble() : NULL;
|
| }
|
|
|
|
|