diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 04:17:13 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 04:17:13 +0000 |
| commit | 6435179b196201aef5f451ab09ba8b2563c64e4d (patch) | |
| tree | 2d3c672dc50a57a033f502ce6f5a0dfb9340af8d /chrome | |
| parent | 8d9ccb455ce9cc738d12c99aac4e275fc2b112ee (diff) | |
| download | chromium_src-6435179b196201aef5f451ab09ba8b2563c64e4d.zip chromium_src-6435179b196201aef5f451ab09ba8b2563c64e4d.tar.gz chromium_src-6435179b196201aef5f451ab09ba8b2563c64e4d.tar.bz2 | |
[Linux] Hide fullscreen bubble when kiosk mode is active.
When chrome is ran in kiosk mode, the fullscreen bubble should be hidden. As well, I found a major variable name mixup in browerview.
BUG=27308
TEST=None
Review URL: http://codereview.chromium.org/385146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 1cd3394..53cc6ad 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -68,6 +68,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/window_sizer.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" @@ -1020,8 +1021,7 @@ bool BrowserWindowGtk::IsFullscreen() const { } bool BrowserWindowGtk::IsFullscreenBubbleVisible() const { - // There is no fullscreen bubble for Linux. - return false; + return fullscreen_exit_bubble_.get() ? true : false; } LocationBar* BrowserWindowGtk::GetLocationBar() const { @@ -1435,8 +1435,12 @@ void BrowserWindowGtk::OnStateChanged(GdkWindowState state, tabstrip_->Hide(); if (IsBookmarkBarSupported()) bookmark_bar_->EnterFullscreen(); - fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( - GTK_FLOATING_CONTAINER(render_area_floating_container_))); + bool is_kiosk =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); + if (!is_kiosk) { + fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk( + GTK_FLOATING_CONTAINER(render_area_floating_container_))); + } gtk_widget_hide(toolbar_border_); #if defined(OS_CHROMEOS) if (main_menu_button_) diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index dd241d1..348e0fb 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -894,12 +894,12 @@ void BrowserView::SetFullscreen(bool fullscreen) { if (fullscreen) { #if !defined(OS_MACOSX) - bool is_kosk = + bool is_kiosk = CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); #else bool is_kiosk = false; #endif - if (!is_kosk) { + if (!is_kiosk) { fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(), browser_.get())); } |