Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

chrome/browser/extensions/api/commands/command_service.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/extensions/api/commands/command_service.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/commands.h"
 #include "chrome/browser/extensions/extension_commands_global_registry.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
+#include "chrome/common/extensions/manifest_handlers/ui_overrides_handler.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
@@ skipping 132 matching lines @@
 }
 
 // static
 CommandService* CommandService::Get(content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<CommandService>::Get(context);
 }
 
 // static
 bool CommandService::RemovesBookmarkShortcut(
     const extensions::Extension* extension) {
+  using extensions::UIOverrides;
   using extensions::SettingsOverrides;
+  const UIOverrides* ui_overrides = UIOverrides::Get(extension);
   const SettingsOverrides* settings_overrides =
       SettingsOverrides::Get(extension);
 
-  return settings_overrides &&
-      SettingsOverrides::RemovesBookmarkShortcut(*settings_overrides) &&
+  return ((settings_overrides &&
+           SettingsOverrides::RemovesBookmarkShortcut(*settings_overrides)) ||
+          (ui_overrides &&
+           UIOverrides::RemovesBookmarkShortcut(*ui_overrides))) &&
       (extensions::PermissionsData::HasAPIPermission(
           extension,
           extensions::APIPermission::kBookmarkManagerPrivate) ||
        extensions::FeatureSwitch::enable_override_bookmarks_ui()->
            IsEnabled());
 }
 
 bool CommandService::GetBrowserActionCommand(const std::string& extension_id,
                                              QueryType type,
                                              extensions::Command* command,
@@ skipping 407 matching lines @@
   return true;
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<CommandService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionCommandsGlobalRegistry::GetFactoryInstance());
 }
 
 }  // namespace extensions