Enforce "override bookmarks UI" manifest permissions for bookmark shortcut overrides

chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc

 // Copyright 2013 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/common/extensions/manifest_handlers/ui_overrides_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 166 matching lines @@
   info->bookmarks_ui.swap(overrides->bookmarks_ui);
   if (!info->bookmarks_ui) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidEmptyDictionary,
         manifest_keys::kUIOverride);
     return false;
   }
   UIOverrides* assigned_ui_overrides = info.get();
   extension->SetManifestData(manifest_keys::kUIOverride, info.release());
   assigned_ui_overrides->manifest_permission.reset(new ManifestPermissionImpl(
-      UIOverrides::RemovesBookmarkButton(extension)));
+      UIOverrides::RemovesBookmarkButton(extension) ||
+      UIOverrides::RemovesBookmarkShortcut(extension) ||
+      UIOverrides::RemovesBookmarkOpenPagesShortcut(extension)));

[not at google - send to devlin, 2014/06/09 18:16:28]

can this basically be info->bookmarks_ui.get() (i.e. just "true" at this
point?).

[Mike Wittman, 2014/06/09 19:57:34]

Yes, I think so. Changed.

   return true;
 }
 
 bool UIOverridesHandler::Validate(const Extension* extension,
                                   std::string* error,
                                   std::vector<InstallWarning>* warnings) const {
   const UIOverrides* ui_overrides = UIOverrides::Get(extension);
 
   if (ui_overrides && ui_overrides->bookmarks_ui) {
     if (!FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled()) {
@@ skipping 17 matching lines @@
   const UIOverrides* data = UIOverrides::Get(extension);
   if (data)
     return data->manifest_permission->Clone();
   return NULL;
 }
 const std::vector<std::string> UIOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kUIOverride);
 }
 
 }  // namespace extensions