diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 03:35:18 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 03:35:18 +0000 |
| commit | b6554cb3a24a2fe8be8ae5f733d5fe1885c54a2b (patch) | |
| tree | e74f0ec9a1d549355bbb3c7ae4876b65bb181bcd | |
| parent | 023813461a28567adabab843e098bc1ca0f3dc23 (diff) | |
| download | chromium_src-b6554cb3a24a2fe8be8ae5f733d5fe1885c54a2b.zip chromium_src-b6554cb3a24a2fe8be8ae5f733d5fe1885c54a2b.tar.gz chromium_src-b6554cb3a24a2fe8be8ae5f733d5fe1885c54a2b.tar.bz2 | |
Revert 226874 "Observe keyboard notifications in docked layout"
Broke ash_unittests on Win8 Aura:
[ RUN ] AcceleratorControllerTest.ControllerContext
[1576:2656:1003/160630:1215294:WARNING:ipc_channel_win.cc(263)] Unable to create pipe "\\.\pipe\chrome.viewer" in server mode. Error :231
[1576:2656:1003/160731:1276431:FATAL:ash_test_base.cc(134)] Check failed: metro_viewer_host_->LaunchViewerAndWaitForConnection( win8::test::kDefaultTestAppUserModelId).
Backtrace:
base::debug::StackTrace::StackTrace [0x100886A1+33]
logging::LogMessage::~LogMessage [0x1011580E+94]
ash::test::AshTestBase::SetUp [0x008061DD+1405]
testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x007DE47F+319]
testing::Test::Run [0x007C8E9B+107]
testing::TestInfo::Run [0x007C98AD+221]
testing::TestCase::Run [0x007CA05F+239]
testing::internal::UnitTestImpl::RunAllTests [0x007D09AD+701]
testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x007DF0A7+327]
testing::UnitTest::Run [0x007CF210+192]
base::TestSuite::Run [0x007A4070+240]
main [0x00612167+103]
__tmainCRTStartup [0x0094A1EF+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555)
mainCRTStartup [0x0094A01F+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371)
BaseThreadInitThunk [0x778C8543+14]
RtlInitializeExceptionChain [0x77C0AC69+133]
RtlInitializeExceptionChain [0x77C0AC3C+88]
(No symbol) [0x00000000]
[1576:2656:1003/160731:1276431:FATAL:ash_test_base.cc(134)] Check failed: metro_viewer_host_->LaunchViewerAndWaitForConnection( win8::test::kDefaultTestAppUserModelId).
Backtrace:
base::debug::StackTrace::StackTrace [0x100886A1+33]
logging::LogMessage::~LogMessage [0x1011580E+94]
ash::test::AshTestBase::SetUp [0x008061DD+1405]
testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x007DE47F+319]
testing::Test::Run [0x007C8E9B+107]
testing::TestInfo::Run [0x007C98AD+221]
testing::TestCase::Run [0x007CA05F+239]
testing::internal::UnitTestImpl::RunAllTests [0x007D09AD+701]
testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x007DF0A7+327]
testing::UnitTest::Run [0x007CF210+192]
base::TestSuite::Run [0x007A4070+240]
main [0x00612167+103]
__tmainCRTStartup [0x0094A1EF+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555)
mainCRTStartup [0x0094A01F+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371)
BaseThreadInitThunk [0x778C8543+14]
RtlInitializeExceptionChain [0x77C0AC69+133]
RtlInitializeExceptionChain [0x77C0AC3C+88]
(No symbol) [0x00000000]
> Observe keyboard notifications in docked layout
>
> BUG=303456
>
> Review URL: https://codereview.chromium.org/25740005
TBR=varkha@chromium.org
Review URL: https://codereview.chromium.org/25683010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226943 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/root_window_controller.cc | 1 | ||||
| -rw-r--r-- | ash/wm/dock/docked_window_layout_manager.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 6c23eee..a1b030e 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -539,7 +539,6 @@ void RootWindowController::InitKeyboard() { keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); keyboard_controller_->AddObserver(panel_layout_manager_); - keyboard_controller_->AddObserver(docked_layout_manager_); // Deletes the old container since |keyboard_controller_| creates a // new container window in GetContainerWindow(). diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 1475031..80b3d57 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -891,7 +891,6 @@ void DockedWindowLayoutManager::OnKeyboardBoundsChanging( const gfx::Rect& keyboard_bounds) { // This bounds change will have caused a change to the Shelf which does not // propagate automatically to this class, so manually recalculate bounds. - Relayout(); UpdateDockBounds(); } |