trunk/src/ui/wm/test/wm_test_helper.cc - Issue 259103003: Revert 266616 "Move DefaultActivationClient to wm/core"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ui/wm/test/wm_test_helper.cc

Issue 259103003: Revert 266616 "Move DefaultActivationClient to wm/core" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/ui/wm/test/wm_test_helper.cc

===================================================================

--- trunk/src/ui/wm/test/wm_test_helper.cc (revision 266631)

+++ trunk/src/ui/wm/test/wm_test_helper.cc (working copy)

@@ -4,12 +4,12 @@

#include "ui/wm/test/wm_test_helper.h"

+#include "ui/aura/client/default_activation_client.h"

#include "ui/aura/client/default_capture_client.h"

#include "ui/aura/env.h"

#include "ui/aura/test/test_focus_client.h"

#include "ui/aura/window.h"

#include "ui/wm/core/compound_event_filter.h"

-#include "ui/wm/core/default_activation_client.h"

#include "ui/wm/core/input_method_event_filter.h"

namespace wm {

@@ -31,7 +31,8 @@

input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());

root_window_event_filter_->AddHandler(input_method_filter_.get());

- new wm::DefaultActivationClient(host_->window());

+ activation_client_.reset(

+ new aura::client::DefaultActivationClient(host_->window()));

capture_client_.reset(

new aura::client::DefaultCaptureClient(host_->window()));

« no previous file with comments | « trunk/src/ui/wm/test/wm_test_helper.h ('k') | trunk/src/ui/wm/wm.gyp » ('j') | no next file with comments »