diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 03:01:47 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 03:01:47 +0000 |
| commit | 2ea65b94fade599f63a1b8599b5977a0a57680a2 (patch) | |
| tree | 1c7f804c8a15de702d5d7d5d3d79aebe604cf09e /chrome/test | |
| parent | 21abcc74837a6cb9537a8026a1b12efc9da402f0 (diff) | |
| download | chromium_src-2ea65b94fade599f63a1b8599b5977a0a57680a2.zip chromium_src-2ea65b94fade599f63a1b8599b5977a0a57680a2.tar.gz chromium_src-2ea65b94fade599f63a1b8599b5977a0a57680a2.tar.bz2 | |
Revert 29861 since this fail on the interactive
linux dbg bot, for some weird reason...
Page actions that don't specify an icon (ie.
have a spelling error in the manifest, such as
icon instead of icons/default_icon) caused a
crash when they try to display their icon.
We now check when the extension tries to enable
the page action whether there are any icons to
display. If not, we don't proceed and log an
error to the console.
TBR=nsylvain
BUG=25562
TEST=Covered by browser test.
Review URL: http://codereview.chromium.org/316018
TBR=finnur@chromium.org
Review URL: http://codereview.chromium.org/327007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
4 files changed, 0 insertions, 52 deletions
diff --git a/chrome/test/data/extensions/browsertest/crash_25562/background.html b/chrome/test/data/extensions/browsertest/crash_25562/background.html deleted file mode 100644 index f27aba8..0000000 --- a/chrome/test/data/extensions/browsertest/crash_25562/background.html +++ /dev/null @@ -1,28 +0,0 @@ -<html> -<script> - // The Page Action ID. - var pageActionId = "TestId"; - - // The window this Page Action is associated with. - var windowId = -1; - - // The TabId this Page Action is associated with. - var tabId = -1; - - // The URL of the page on build.chromium.org. - var pageUrl = ""; - - chrome.self.onConnect.addListener(function(port) { - windowId = port.tab.windowId; - tabId = port.tab.id; - pageUrl = port.tab.url; - - port.onMessage.addListener(function(mybool) { - // Let Chrome know that the PageAction needs to be enabled for this tabId - // and for the url of this page. - chrome.pageActions.enableForTab(pageActionId, - {tabId: tabId, url: pageUrl}); - }); - }); -</script> -</html> diff --git a/chrome/test/data/extensions/browsertest/crash_25562/chrome-16.png b/chrome/test/data/extensions/browsertest/crash_25562/chrome-16.png Binary files differdeleted file mode 100644 index a3a4f3a..0000000 --- a/chrome/test/data/extensions/browsertest/crash_25562/chrome-16.png +++ /dev/null diff --git a/chrome/test/data/extensions/browsertest/crash_25562/manifest.json b/chrome/test/data/extensions/browsertest/crash_25562/manifest.json deleted file mode 100644 index 9d9e8fb..0000000 --- a/chrome/test/data/extensions/browsertest/crash_25562/manifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "background_page": "background.html", - "content_scripts": [ { - "js": [ "script.js" ], - "matches": [ "http://*/*" ] - } ], - "description": "A page action with incorrect icon specification", - "name": "Test extension", - "page_actions": [ { - "icon": "chrome-16.png", - "id": "TestId", - "name": "Page action name", - "tooltip": "Page action tooltip" - } ], - "permissions": [ "http://*/*" ], - "version": "1.0" -} diff --git a/chrome/test/data/extensions/browsertest/crash_25562/script.js b/chrome/test/data/extensions/browsertest/crash_25562/script.js deleted file mode 100644 index b602eb8..0000000 --- a/chrome/test/data/extensions/browsertest/crash_25562/script.js +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2009 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. - -if (window == top) { - chrome.extension.connect().postMessage(true); -} |
