Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Revert of Fixes HasEventListener check in ExtensionKeybindingRegistry…
Browse files Browse the repository at this point in the history
…::ExecuteCommands. (patchset #1 id:1 of https://codereview.chromium.org/547783002/)

Reason for revert:
Broke Linux ChromiumOS Tests (dbg)(3)

http://build.chromium.org/p/chromium.webkit/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%283%29/builds/1206

BrowserTestBase signal handler received SIGTERM. Backtrace:
#0 0x7f3bcf3aa67e base::debug::StackTrace::StackTrace()
#1 0x0000041c884a content::(anonymous namespace)::DumpStackTraceSignalHandler()
#2 0x7f3bc709f4a0 <unknown>
#3 0x7f3bc7151a43 __poll
#4 0x7f3bc7b8dff6 <unknown>
#5 0x7f3bc7b8e124 g_main_context_iteration
#6 0x7f3bcf366f35 base::MessagePumpGlib::Run()
#7 0x7f3bcf468180 base::MessageLoop::RunHandler()
#8 0x7f3bcf4cfcc2 base::RunLoop::Run()
#9 0x0000041e0729 content::RunThisRunLoop()
#10 0x0000041e06ba content::RunMessageLoop()
#11 0x000000668feb ExtensionApiTest::ResultCatcher::GetNextResult()
#12 0x0000006a30dd extensions::CommandsApiTest_ContinuePropagation_Test::RunTestOnMainThread()
#13 0x0000006a3712 extensions::CommandsApiTest_ContinuePropagation_Test::RunTestOnMainThread()
#14 0x00000176be8b InProcessBrowserTest::RunTestOnMainThreadLoop()
#15 0x0000041c85c8 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
#16 0x0000041c9cf2 base::internal::RunnableAdapter<>::Run()
#17 0x0000041c9c69 base::internal::InvokeHelper<>::MakeItSo()
#18 0x0000041c9c25 base::internal::Invoker<>::Run()
#19 0x00000063f0de base::Callback<>::Run()
#20 0x0000042dddd2 ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
#21 0x0000042dca92 ChromeBrowserMainParts::PreMainMessageLoopRun()
#22 0x000002e77daf chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
#23 0x7f3bd7bd2e96 content::BrowserMainLoop::PreMainMessageLoopRun()
#24 0x7f3bd7bd96f2 base::internal::RunnableAdapter<>::Run()
#25 0x7f3bd7bd965c base::internal::InvokeHelper<>::MakeItSo()
#26 0x7f3bd7bd960a base::internal::Invoker<>::Run()
#27 0x7f3bd80a852e base::Callback<>::Run()
#28 0x7f3bd841bd2b content::StartupTaskRunner::RunAllTasksNow()
#29 0x7f3bd7bd12f0 content::BrowserMainLoop::CreateStartupTasks()
#30 0x7f3bd7bdcc72 content::BrowserMainRunnerImpl::Initialize()
#31 0x7f3bd7bcda55 content::BrowserMain()
#32 0x7f3bd7a6224f content::RunNamedProcessTypeMain()
#33 0x7f3bd7a655b8 content::ContentMainRunnerImpl::Run()
#34 0x7f3bd7a617b5 content::ContentMain()
#35 0x0000041c82cb content::BrowserTestBase::SetUp()
#36 0x00000176afc3 InProcessBrowserTest::SetUp()
#37 0x000000674823 ExtensionBrowserTest::SetUp()
#38 0x000000674852 ExtensionBrowserTest::SetUp()
#39 0x0000018298a3 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#40 0x00000181686e testing::internal::HandleExceptionsInMethodIfSupported<>()
#41 0x00000180ad73 testing::Test::Run()
#42 0x00000180b4cb testing::TestInfo::Run()
#43 0x00000180baca testing::TestCase::Run()
#44 0x000001811009 testing::internal::UnitTestImpl::RunAllTests()
#45 0x0000018225b3 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#46 0x0000018185fe testing::internal::HandleExceptionsInMethodIfSupported<>()
#47 0x000001810c97 testing::UnitTest::Run()
#48 0x0000041a5531 RUN_ALL_TESTS()
#49 0x0000041a4547 base::TestSuite::Run()
#50 0x0000008026d2 InteractiveUITestSuiteRunner::RunTestSuite()
#51 0x000001769618 (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite()
#52 0x0000041d9efb content::LaunchTests()
#53 0x00000176954b LaunchChromeTests()
#54 0x00000080262f main
#55 0x7f3bc708a76d __libc_start_main
#56 0x0000005ffda9 <unknown>
[123/334] CommandsApiTest.ContinuePropagation (TIMED OUT)

Original issue's description:
> Fixes HasEventListener check in ExtensionKeybindingRegistry::ExecuteCommands.
>
> ExtensionKeybindingRegistry::ExecuteCommands functions in two distinct ways -- execute all commands based on an accelerator, or, execute an accelerator for a given extension. The former behavior is implied by passing an empty string.
>
> Previously, only the latter case was handled when trying to continue propagating keys.
>
> BUG=407163
> TEST=try bots (interactive_ui_tests --gtest_filter=CommandsApiTest.*).
>
> Committed: https://chromium.googlesource.com/chromium/src/+/189a2ed4d209231d517b0e64a722722dead3f17a

[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=407163

Review URL: https://codereview.chromium.org/552533003

Cr-Commit-Position: refs/heads/master@{#293780}
  • Loading branch information
arv authored and Commit bot committed Sep 8, 2014
1 parent 5994c38 commit f12dd21
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions chrome/browser/extensions/extension_keybinding_registry.cc
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,14 @@ bool ExtensionKeybindingRegistry::ExecuteCommands(
if (targets == event_targets_.end() || targets->second.empty())
return false;

if (!extension_id.empty() &&
!extensions::EventRouter::Get(browser_context_)
->ExtensionHasEventListener(extension_id, kOnCommandEventName))
return false;

bool executed = false;
for (TargetList::const_iterator it = targets->second.begin();
it != targets->second.end(); it++) {
if (!extensions::EventRouter::Get(browser_context_)
->ExtensionHasEventListener(it->first, kOnCommandEventName))
continue;

if (extension_id.empty() || it->first == extension_id) {
CommandExecuted(it->first, it->second);
executed = true;
Expand Down

0 comments on commit f12dd21

Please sign in to comment.