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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 7484029: Implemented kiosk mode for Mac. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase from trunk Created 8 years, 6 months 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 | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/presentation_mode_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 3de70af6fafa78562686ac2d2acd1632131ff39e..a093d02cff60a3755fcd177110dc40b19c33ef29 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -31,6 +31,7 @@
#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
@@ -682,7 +683,10 @@ willPositionSheet:(NSWindow*)sheet
if (presentationMode) {
BOOL fullscreen_for_tab = browser_->IsFullscreenForTabOrPending();
+ BOOL kiosk_mode =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
BOOL showDropdown = !fullscreen_for_tab &&
+ !kiosk_mode &&
(forceDropdown || [self floatingBarHasFocus]);
NSView* contentView = [[self window] contentView];
presentationModeController_.reset(
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/presentation_mode_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698