Revert of Refactor and move ash independent nested accelerator code to ui/wm/core...
commit284145ef5545b59030bd65da2e002e54d2c1b8b6
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 27 May 2014 19:04:09 +0000 (27 19:04 +0000)
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 27 May 2014 19:04:09 +0000 (27 19:04 +0000)
treebd2965395947bd846578ce437bb15c51538d2fc8
parentb90ab636f8cebc04e6cff488020fe28a3f4c967e
Revert of Refactor and move ash independent nested accelerator code to ui/wm/core (https://codereview.chromium.org/298703007/)

Reason for revert:
caused test failures:
http://build.chromium.org/p/chromium.win/builders/Win8%20Aura/builds/19236

NestedAcceleratorTest.AcceleratorsHandled (run #1):
[ RUN      ] NestedAcceleratorTest.AcceleratorsHandled
Backtrace:
ui::PlatformEventSource::OverrideDispatcher [0x0028B66D+253]
wm::test::NestedAcceleratorTest_AcceleratorsHandled_Test::TestBody [0x00455D37+215]
testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::Test,void> [0x004D5829+329]
testing::Test::Run [0x004EFF9E+174]
testing::TestInfo::Run [0x004F023D+221]
testing::TestCase::Run [0x004F00DF+239]
testing::internal::UnitTestImpl::RunAllTests [0x004F0696+726]
testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl,bool> [0x004D5D21+337]
testing::UnitTest::Run [0x004F0393+211]
RUN_ALL_TESTS [0x004A0EDF+15]
base::TestSuite::Run [0x004A1129+233]
base::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>::Run [0x004150EB+27]
base::internal::InvokeHelper\u003C0,int,base::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>,void __cdecl(WMTestSuite *)>::MakeItSo [0x00414FFA+26]
base::internal::Invoker\u003C1,base::internal::BindState\u003Cbase::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>,int __cdecl(base::TestSuite *),void __cdecl(base::internal::UnretainedWrapper\u003CWMTestSuite>)>,int __cdecl(base::TestSuite *)>::Ru [0x0041506A+74]
base::Callback\u003Cint __cdecl(void)>::Run [0x0049A03F+47]
base::`anonymous namespace'::LaunchUnitTestsInternal [0x004990C9+921]
base::LaunchUnitTests [0x00498D15+37]
main [0x0041681C+140]
__tmainCRTStartup [0x00647D39+409] (f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c:626)
mainCRTStartup [0x00647E7D+13] (f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c:466)
BaseThreadInitThunk [0x76568624+14]
RtlInitializeExceptionChain [0x773CAC69+133]
RtlInitializeExceptionChain [0x773CAC3C+88]

NestedAcceleratorTest.AssociatedWindowAboveLockScreen (run #1):
[ RUN      ] NestedAcceleratorTest.AssociatedWindowAboveLockScreen
Backtrace:
ui::PlatformEventSource::OverrideDispatcher [0x0286B66D+253]
wm::test::NestedAcceleratorTest_AssociatedWindowAboveLockScreen_Test::TestBody [0x004563B5+517]
testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::Test,void> [0x004D5829+329]
testing::Test::Run [0x004EFF9E+174]
testing::TestInfo::Run [0x004F023D+221]
testing::TestCase::Run [0x004F00DF+239]
testing::internal::UnitTestImpl::RunAllTests [0x004F0696+726]
testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl,bool> [0x004D5D21+337]
testing::UnitTest::Run [0x004F0393+211]
RUN_ALL_TESTS [0x004A0EDF+15]
base::TestSuite::Run [0x004A1129+233]
base::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>::Run [0x004150EB+27]
base::internal::InvokeHelper\u003C0,int,base::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>,void __cdecl(WMTestSuite *)>::MakeItSo [0x00414FFA+26]
base::internal::Invoker\u003C1,base::internal::BindState\u003Cbase::internal::RunnableAdapter\u003Cint (__thiscall base::TestSuite::*)(void)>,int __cdecl(base::TestSuite *),void __cdecl(base::internal::UnretainedWrapper\u003CWMTestSuite>)>,int __cdecl(base::TestSuite *)>::Ru [0x0041506A+74]
base::Callback\u003Cint __cdecl(void)>::Run [0x0049A03F+47]
base::`anonymous namespace'::LaunchUnitTestsInternal [0x004990C9+921]
base::LaunchUnitTests [0x00498D15+37]
main [0x0041681C+140]
__tmainCRTStartup [0x00647D39+409] (f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c:626)
mainCRTStartup [0x00647E7D+13] (f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c:466)
BaseThreadInitThunk [0x76568624+14]
RtlInitializeExceptionChain [0x773CAC69+133]
RtlInitializeExceptionChain [0x773CAC3C+88]

Original issue's description:
> Refactor and move ash independent accelerator handling code in nested loop to ui/wm/core
>
> I also renamed classes to NestedAcceleratorXxx. I felt this is a bit more clearer than NestedDispatcher, especially in ui/wm/core. Please let me know if you disagree or have better suggestion. I'm happy to rename them.
>
> BUG=None
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272740
>
> R=ben@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272995

TBR=ben@chromium.org,oshima@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273003 0039d316-1c4b-4281-b951-d872f2087c98
17 files changed:
ash/accelerators/accelerator_dispatcher.cc [moved from ash/accelerators/nested_accelerator_delegate.cc with 85% similarity]
ash/accelerators/accelerator_dispatcher.h [new file with mode: 0644]
ash/accelerators/accelerator_dispatcher_linux.cc [moved from ui/wm/core/nested_accelerator_dispatcher_linux.cc with 70% similarity]
ash/accelerators/accelerator_dispatcher_win.cc [moved from ui/wm/core/nested_accelerator_dispatcher_win.cc with 54% similarity]
ash/accelerators/nested_accelerator_delegate.h [deleted file]
ash/accelerators/nested_dispatcher_controller.cc [moved from ui/wm/core/nested_accelerator_controller.cc with 54% similarity]
ash/accelerators/nested_dispatcher_controller.h [moved from ui/wm/core/nested_accelerator_controller.h with 50% similarity]
ash/accelerators/nested_dispatcher_controller_unittest.cc [new file with mode: 0644]
ash/ash.gyp
ash/shell.cc
ash/shell.h
ui/wm/core/DEPS
ui/wm/core/nested_accelerator_controller_unittest.cc [deleted file]
ui/wm/core/nested_accelerator_delegate.h [deleted file]
ui/wm/core/nested_accelerator_dispatcher.cc [deleted file]
ui/wm/core/nested_accelerator_dispatcher.h [deleted file]
ui/wm/wm.gyp