diff options
author | bolms@chromium.org <bolms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 17:02:37 +0000 |
---|---|---|
committer | bolms@chromium.org <bolms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 17:02:37 +0000 |
commit | 5d02621f154a577f67e51122dc67834b4845d738 (patch) | |
tree | 0fa70a5c4084e5bb081be3a841c3c797b837defc /chrome/renderer/resources | |
parent | a74c3c1a5085f2d200b6709dd03320d469eac550 (diff) | |
download | chromium_src-5d02621f154a577f67e51122dc67834b4845d738.zip chromium_src-5d02621f154a577f67e51122dc67834b4845d738.tar.gz chromium_src-5d02621f154a577f67e51122dc67834b4845d738.tar.bz2 |
Use a global counter for context menu IDs.
BUG=51436
TEST=Create an extension which creates context menu items from multiple contexts (background page+popup, for example). Both contexts should be able to add context menu items.
Review URL: http://codereview.chromium.org/6715011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources')
-rw-r--r-- | chrome/renderer/resources/extension_process_bindings.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js index d8c2648..d9c97e1 100644 --- a/chrome/renderer/resources/extension_process_bindings.js +++ b/chrome/renderer/resources/extension_process_bindings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,6 +13,7 @@ var chrome = chrome || {}; native function GetExtensionViews(); native function GetChromeHidden(); native function GetNextRequestId(); + native function GetNextContextMenuId(); native function OpenChannelToTab(); native function GetRenderViewId(); native function SetIconCommon(); @@ -795,7 +796,7 @@ var chrome = chrome || {}; apiFunctions["contextMenus.create"].handleRequest = function() { var args = arguments; - var id = chromeHidden.contextMenus.nextId++; + var id = GetNextContextMenuId(); args[0].generatedId = id; sendRequest(this.name, args, this.definition.parameters, this.customCallback); |