<webview>: Context menu API implementation CL.

chrome/browser/extensions/api/context_menus/context_menus_api.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/context_menus/context_menus_api.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/values.h"
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 namespace extensions {
 
 namespace Create = api::context_menus::Create;
 namespace Remove = api::context_menus::Remove;
 namespace Update = api::context_menus::Update;
 
 bool ContextMenusCreateFunction::RunImpl() {
-  MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id id(GetProfile()->IsOffTheRecord(),
+                  MenuItem::ExtensionKey(extension_id()));
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (params->create_properties.id.get()) {
     id.string_uid = *params->create_properties.id;
   } else {
     if (BackgroundInfo::HasLazyBackgroundPage(GetExtension())) {
       error_ = kIdRequiredError;
       return false;
     }
 
     // The Generated Id is added by context_menus_custom_bindings.js.
     base::DictionaryValue* properties = NULL;
     EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &properties));
     EXTENSION_FUNCTION_VALIDATE(
         properties->GetInteger(helpers::kGeneratedIdKey, &id.uid));
   }
 
   return helpers::CreateMenuItem(params->create_properties, GetProfile(),
                                  GetExtension(), id, &error_);
 }
 
 bool ContextMenusUpdateFunction::RunImpl() {
-  MenuItem::Id item_id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id item_id(GetProfile()->IsOffTheRecord(),
+                       MenuItem::ExtensionKey(extension_id()));
   scoped_ptr<Update::Params> params(Update::Params::Create(*args_));
 
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->id.as_string)
     item_id.string_uid = *params->id.as_string;
   else if (params->id.as_integer)
     item_id.uid = *params->id.as_integer;
   else
     NOTREACHED();
 
   return helpers::UpdateMenuItem(params->update_properties, GetProfile(),
                                  GetExtension(), item_id, &error_);
 }
 
 bool ContextMenusRemoveFunction::RunImpl() {
   scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   MenuManager* manager = MenuManager::Get(GetProfile());
 
-  MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id id(GetProfile()->IsOffTheRecord(),
+                  MenuItem::ExtensionKey(extension_id()));
   if (params->menu_item_id.as_string)
     id.string_uid = *params->menu_item_id.as_string;
   else if (params->menu_item_id.as_integer)
     id.uid = *params->menu_item_id.as_integer;
   else
     NOTREACHED();
 
   MenuItem* item = manager->GetItemById(id);
   // Ensure one extension can't remove another's menu items.
   if (!item || item->extension_id() != extension_id()) {
     error_ = ErrorUtils::FormatErrorMessage(
         helpers::kCannotFindItemError, helpers::GetIDString(id));
     return false;
   }
 
   if (!manager->RemoveContextMenuItem(id))
     return false;
-  manager->WriteToStorage(GetExtension());
+  manager->WriteToStorage(GetExtension(), id.extension_key);
   return true;
 }
 
 bool ContextMenusRemoveAllFunction::RunImpl() {
   MenuManager* manager = MenuManager::Get(GetProfile());
-  manager->RemoveAllContextItems(GetExtension()->id());
-  manager->WriteToStorage(GetExtension());
+  manager->RemoveAllContextItems(MenuItem::ExtensionKey(GetExtension()->id()));
+  manager->WriteToStorage(GetExtension(),
+                          MenuItem::ExtensionKey(GetExtension()->id()));
   return true;
 }
 
 }  // namespace extensions