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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index f06bf77cb6adc2bdd345eb1e516ee3c6c8df4642..8783e0b68366216fbfefbe5e8e60c51e08013c04 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -4,6 +4,7 @@
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
+#include "base/command_line.h"
#include "base/mac/bundle_locations.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.h"
@@ -43,6 +44,7 @@
#import "chrome/browser/ui/cocoa/view_id_util.h"
#import "chrome/browser/ui/cocoa/view_resizer.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_metrics.h"
#include "chrome/common/pref_names.h"
@@ -288,9 +290,11 @@ void RecordAppLaunch(Profile* profile, GURL url) {
name:bookmark_button::kPulseBookmarkButtonNotification
object:nil];
- contextMenuController_.reset(
- [[BookmarkContextMenuCocoaController alloc]
- initWithBookmarkBarController:self]);
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) {
Peter Kasting 2015/06/15 20:16:33 Nit: 80 columns
frederic.jacob.78 2015/06/24 18:07:52 Acknowledged.
+ contextMenuController_.reset(
+ [[BookmarkContextMenuCocoaController alloc]
+ initWithBookmarkBarController:self]);
+ }
// This call triggers an -awakeFromNib, which builds the bar, which might
// use |folderImage_| and |contextMenuController_|. Ensure it happens after

Powered by Google App Engine
This is Rietveld 408576698