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

Unified Diff: chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm

Issue 1091173005: Removed the context menu in kiosk mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable the context menu in kiosk mode Created 5 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
Index: chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
index c5de5973d91655b845c12f21209c2029671d8bb0..3c558f71b93bfcedaebf76e977c8b223b2fa813e 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
@@ -4,12 +4,14 @@
#include "chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h"
+#include "base/command_line.h"
#include "base/compiler_specific.h"
#import "base/mac/scoped_sending_event.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/sys_string_conversions.h"
#include "base/tracked_objects.h"
#include "chrome/app/chrome_command_ids.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
@@ -93,6 +95,10 @@ RenderViewContextMenuMac::~RenderViewContextMenuMac() {
}
void RenderViewContextMenuMac::Show() {
+ // Don't display the context menu in kiosk mode.
Peter Kasting 2015/06/15 20:16:33 Nit: This comment just restates the code, remove i
frederic.jacob.78 2015/06/24 18:07:53 This change have been removed but I have done it f
+ if(base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
Peter Kasting 2015/06/15 20:16:33 Nit: space after "if"
frederic.jacob.78 2015/06/24 18:07:52 Acknowledged.
+ return;
+
menu_controller_.reset(
[[MenuController alloc] initWithModel:&menu_model_
useWithPopUpButtonCell:NO]);

Powered by Google App Engine
This is Rietveld 408576698