Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5283)

Unified Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 385146: [Linux] Hide fullscreen bubble when kiosk mode is active. (Closed)
Patch Set: Indent 2 spaces Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 1cd3394dbe58cba525f27c06e5281be69480d0d1..53cc6ad504ba084d2b52d8a45852938b31d697d7 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_)
« no previous file with comments | « no previous file | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698