| Index: chrome/browser/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
|
| index ac22274026df6a1d06e63a7de0ca7ff99f11c6e7..23d7bd3e8e834c947d01d7a1fa9ba3cced14bcc4 100644
|
| --- a/chrome/browser/views/frame/browser_view.cc
|
| +++ b/chrome/browser/views/frame/browser_view.cc
|
| @@ -893,8 +893,16 @@ void BrowserView::SetFullscreen(bool fullscreen) {
|
| frame_->GetWindow()->SetFullscreen(fullscreen);
|
|
|
| if (fullscreen) {
|
| - fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(),
|
| - browser_.get()));
|
| +#if !defined(OS_MACOSX)
|
| + bool is_kosk =
|
| + CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
|
| +#else
|
| + bool is_kiosk = false;
|
| +#endif
|
| + if (!is_kosk) {
|
| + fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(),
|
| + browser_.get()));
|
| + }
|
| } else {
|
| #if defined(OS_WIN)
|
| // Show the edit again since we're no longer in fullscreen mode.
|
| @@ -916,6 +924,10 @@ bool BrowserView::IsFullscreen() const {
|
| return frame_->GetWindow()->IsFullscreen();
|
| }
|
|
|
| +bool BrowserView::IsFullscreenBubbleVisible() const {
|
| + return fullscreen_bubble_.get() ? true : false;
|
| +}
|
| +
|
| LocationBar* BrowserView::GetLocationBar() const {
|
| return toolbar_->location_bar();
|
| }
|
|
|