diff options
| author | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 00:14:04 +0000 |
|---|---|---|
| committer | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 00:14:04 +0000 |
| commit | 7c44a3ae5a93f2fb2689a649e3220026a96aa95e (patch) | |
| tree | ba6253cf3a0783c304931d1556776765ea935495 /ui/snapshot | |
| parent | aafcd5e77a8875d8cef4b00f24573e7876a6a5ca (diff) | |
| download | chromium_src-7c44a3ae5a93f2fb2689a649e3220026a96aa95e.zip chromium_src-7c44a3ae5a93f2fb2689a649e3220026a96aa95e.tar.gz chromium_src-7c44a3ae5a93f2fb2689a649e3220026a96aa95e.tar.bz2 | |
Revert of Move DefaultActivationClient to wm/core (https://codereview.chromium.org/250113002/)
Reason for revert:
views_unittest TooltipController test failures
views_unittests views_unittests 4 disabled 10 flaky failed 10 ( 9 secs )
stdio
Capture
CloseOnCaptureLost
DontShowEmptyTooltips
EnableOrDisableTooltips
HideOnExit
ReshowOnClickAfterEnterExit
TooltipHidesOnKeyPressAndStaysHiddenUntilChange
TooltipHidesOnTimeoutAndStaysHiddenUntilChange
TooltipsInMultipleViews
ViewTooltip
TooltipControllerTest.ViewTooltip (run #2):
[ RUN ] TooltipControllerTest.ViewTooltip
Xlib: extension "RANDR" missing on display ":9".
Received signal 11 SEGV_MAPERR 000000000000
#0 0x000000a88e4e base::debug::StackTrace::StackTrace()
#1 0x000000a89068 base::debug::(anonymous namespace)::StackDumpSignalHandler()
#2 0x7f9474270cb0 \u003Cunknown>
#3 0x000000736b83 views::NativeWidgetAura::Activate()
#4 0x000000737508 views::NativeWidgetAura::ShowWithWindowState()
#5 0x000000738acb views::Widget::Show()
#6 0x00000052cb09 views::corewm::test::(anonymous namespace)::CreateWidget()
#7 0x00000052d397 views::corewm::test::TooltipControllerTest::SetUp()
#8 0x00000065a16a testing::Test::Run().
Original issue's description:
> Move DefaultActivationClient to wm/core
>
> Several tests are using AuraTestHelper and were relying on it to set up the DefaultActivationClient, so I had to have them instantiate the DAC directly after calling SetUp() on the helper. I also had to make the DAC delete itself after the root window it's bound to is destroyed.
>
> R=sky@chromium.org
> http://crbug.com/308710
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266616
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266975
TBR=sky@chromium.org,ben@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/261553002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/DEPS | 1 | ||||
| -rw-r--r-- | ui/snapshot/snapshot.gyp | 1 | ||||
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS index f6768d1..08ad30c 100644 --- a/ui/snapshot/DEPS +++ b/ui/snapshot/DEPS @@ -8,5 +8,4 @@ include_rules = [ "+ui/compositor", "+ui/gfx", "+ui/gl", - "+ui/wm", ] diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index e34b0c2..1f0c645 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -68,7 +68,6 @@ '../aura/aura.gyp:aura_test_support', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', - '../wm/wm.gyp:wm', ], }], # See http://crbug.com/162998#c4 for why this is needed. diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index eee20b3..b000ad1 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -23,7 +23,6 @@ #include "ui/gfx/size_conversions.h" #include "ui/gfx/transform.h" #include "ui/gl/gl_implementation.h" -#include "ui/wm/core/default_activation_client.h" namespace ui { namespace { @@ -94,7 +93,6 @@ class SnapshotAuraTest : public testing::Test { helper_.reset( new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); helper_->SetUp(); - new ::wm::DefaultActivationClient(helper_->root_window()); } virtual void TearDown() OVERRIDE { |