summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-13 22:15:29 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-13 22:15:29 +0000
commit9665fa68fd7f65d34ee1796641649466e74f6cd7 (patch)
tree3219e368f2597813d46eb88c678fc76f2e08fe3c /chrome/browser/extensions
parent34cdd0557b61c9c98aa0510cadfcd814a8156b44 (diff)
downloadchromium_src-9665fa68fd7f65d34ee1796641649466e74f6cd7.zip
chromium_src-9665fa68fd7f65d34ee1796641649466e74f6cd7.tar.gz
chromium_src-9665fa68fd7f65d34ee1796641649466e74f6cd7.tar.bz2
Hook up extension events to the json parser, and change the extension message
passing stuff to use json. Also made sure to lowercase extension IDs when looking them up in ExtensionMessageService. Review URL: http://codereview.chromium.org/67054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rwxr-xr-xchrome/browser/extensions/extension_message_service.cc3
-rwxr-xr-xchrome/browser/extensions/extension_view_unittest.cc4
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index ef2530a..8a4ef73 100755
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -73,7 +73,8 @@ int ExtensionMessageService::OpenChannelToExtension(
ResourceMessageFilter* dest = NULL;
{
AutoLock lock(renderers_lock_);
- ProcessIDMap::iterator process_id = process_ids_.find(extension_id);
+ ProcessIDMap::iterator process_id = process_ids_.find(
+ StringToLowerASCII(extension_id));
if (process_id == process_ids_.end())
return -1;
diff --git a/chrome/browser/extensions/extension_view_unittest.cc b/chrome/browser/extensions/extension_view_unittest.cc
index 5784b8a..a1dd565 100755
--- a/chrome/browser/extensions/extension_view_unittest.cc
+++ b/chrome/browser/extensions/extension_view_unittest.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/extensions/test_extension_loader.h"
#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -72,6 +73,9 @@ class ExtensionViewTest : public InProcessBrowserTest {
InProcessBrowserTest::SetUp();
}
+ virtual void SetUpCommandLine(CommandLine* command_line) {
+ command_line->AppendSwitch(switches::kEnableExtensions);
+ }
};
// Tests that ExtensionView starts an extension process and runs the script