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 /mojo | |
| 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 'mojo')
| -rw-r--r-- | mojo/examples/launcher/DEPS | 1 | ||||
| -rw-r--r-- | mojo/examples/launcher/launcher.cc | 6 | ||||
| -rw-r--r-- | mojo/mojo_examples.gypi | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mojo/examples/launcher/DEPS b/mojo/examples/launcher/DEPS index 270ff3a..6242444 100644 --- a/mojo/examples/launcher/DEPS +++ b/mojo/examples/launcher/DEPS @@ -8,6 +8,5 @@ include_rules = [ "+ui/gfx", "+ui/gl", "+ui/views", - "+ui/wm", "+webkit/common/gpu", ] diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 042a7bdb..11baf57 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -23,6 +23,7 @@ #include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/client/aura_constants.h" +#include "ui/aura/client/default_activation_client.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" @@ -44,7 +45,6 @@ #include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "ui/wm/core/default_activation_client.h" #include "url/gurl.h" #if defined(WIN32) @@ -244,7 +244,8 @@ class LauncherImpl : public Application, focus_client_.reset(new aura::test::TestFocusClient()); aura::client::SetFocusClient(window_tree_host_->window(), focus_client_.get()); - new wm::DefaultActivationClient(window_tree_host_->window()); + activation_client_.reset( + new aura::client::DefaultActivationClient(window_tree_host_->window())); capture_client_.reset( new aura::client::DefaultCaptureClient(window_tree_host_->window())); ime_filter_.reset(new MinimalInputEventFilter(window_tree_host_->window())); @@ -262,6 +263,7 @@ class LauncherImpl : public Application, scoped_ptr<DemoScreen> screen_; scoped_ptr<LauncherWindowTreeClient> window_tree_client_; + scoped_ptr<aura::client::DefaultActivationClient> activation_client_; scoped_ptr<aura::client::FocusClient> focus_client_; scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; scoped_ptr<ui::EventHandler> ime_filter_; diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index 00d5e81..5bece9b 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -255,7 +255,6 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/views/views.gyp:views', - '../ui/wm/wm.gyp:wm', '../url/url.gyp:url_lib', 'mojo_aura_demo_support', 'mojo_common_lib', |