Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: content/shell/browser/shell_platform_data_aura.cc

Issue 250113002: Move DefaultActivationClient to wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_platform_data_aura.h ('k') | mojo/examples/launcher/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_platform_data_aura.cc
diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc
index 0a6327977d00051c12111f5af8dee9a137fc164a..33b8073ba7be633573817b4a7eb455194fc6438f 100644
--- a/content/shell/browser/shell_platform_data_aura.cc
+++ b/content/shell/browser/shell_platform_data_aura.cc
@@ -6,7 +6,6 @@
#include "content/shell/browser/shell.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/env.h"
#include "ui/aura/layout_manager.h"
@@ -18,6 +17,7 @@
#include "ui/base/ime/input_method_delegate.h"
#include "ui/base/ime/input_method_factory.h"
#include "ui/gfx/screen.h"
+#include "ui/wm/core/default_activation_client.h"
namespace content {
@@ -121,8 +121,7 @@ ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {
focus_client_.reset(new aura::test::TestFocusClient());
aura::client::SetFocusClient(host_->window(), focus_client_.get());
- activation_client_.reset(
- new aura::client::DefaultActivationClient(host_->window()));
+ new wm::DefaultActivationClient(host_->window());
capture_client_.reset(
new aura::client::DefaultCaptureClient(host_->window()));
window_tree_client_.reset(
« no previous file with comments | « content/shell/browser/shell_platform_data_aura.h ('k') | mojo/examples/launcher/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698