mac: Allows extensions to hide the bookmark page menu item.

chrome/browser/ui/bookmarks/bookmark_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/common/extension_set.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chrome {
 
 int num_bookmark_urls_before_prompting = 15;
 
 namespace {
@@ skipping 251 matching lines @@
   return chrome::IsInstantExtendedAPIEnabled() && !profile->IsOffTheRecord();
 }
 
 bool ShouldShowAppsShortcutInBookmarkBar(
   Profile* profile,
   chrome::HostDesktopType host_desktop_type) {
   return IsAppsShortcutEnabled(profile, host_desktop_type) &&
       profile->GetPrefs()->GetBoolean(prefs::kShowAppsShortcutInBookmarkBar);
 }
 
-BookmarkShortcutDisposition GetBookmarkShortcutDisposition(
-    const extensions::CommandService* command_service,
-    const extensions::Extension* extension) {
-  if (command_service->OverridesBookmarkShortcut(extension))
-    return BOOKMARK_SHORTCUT_DISPOSITION_OVERRIDDEN;
+BookmarkShortcutDisposition GetBookmarkShortcutDisposition(Profile* profile) {
+  extensions::CommandService* command_service =
+      extensions::CommandService::Get(profile);
 
-  return extensions::CommandService::RemovesBookmarkShortcut(extension) ?
-      BOOKMARK_SHORTCUT_DISPOSITION_REMOVED :
-      BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED;
+  const extensions::ExtensionSet* extension_set =
+      extensions::ExtensionSystem::Get(profile)->
+          extension_service()->extensions();
+  // This flag tracks whether any extension wants the disposition to be
+  // removed.
+  bool removed = false;
+  for (extensions::ExtensionSet::const_iterator i = extension_set->begin();
+       i != extension_set->end();
+       ++i) {
+    // Use the overridden disposition if any extension wants it.
+    if (command_service->OverridesBookmarkShortcut(*i))
+      return BOOKMARK_SHORTCUT_DISPOSITION_OVERRIDDEN;
+
+    if (!removed && extensions::CommandService::RemovesBookmarkShortcut(*i))
+      removed = true;
+  }
+
+  if (removed)

[erikchen, 2014/02/26 19:58:23]

I consider this form to be slightly clearer than the ternary operator, let me
know if you prefer the ternary here.

+    return BOOKMARK_SHORTCUT_DISPOSITION_REMOVED;
+  return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED;
+}
+
+bool ShouldShowBookmarkPageMenuItem(Profile* profile) {
+  return GetBookmarkShortcutDisposition(profile) !=
+         BOOKMARK_SHORTCUT_DISPOSITION_REMOVED;
 }
 
 }  // namespace chrome