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

Unified Diff: trunk/src/content/browser/media/capture/desktop_capture_device_aura_unittest.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:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
===================================================================
--- trunk/src/content/browser/media/capture/desktop_capture_device_aura_unittest.cc (revision 266631)
+++ trunk/src/content/browser/media/capture/desktop_capture_device_aura_unittest.cc (working copy)
@@ -15,7 +15,6 @@
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
#include "ui/compositor/test/context_factories_for_test.h"
-#include "ui/wm/core/default_activation_client.h"
using ::testing::_;
using ::testing::AnyNumber;
@@ -66,7 +65,6 @@
ui::InitializeContextFactoryForTests(enable_pixel_output);
helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
helper_->SetUp();
- new wm::DefaultActivationClient(helper_->root_window());
// We need a window to cover desktop area so that DesktopCaptureDeviceAura
// can use gfx::NativeWindow::GetWindowAtScreenPoint() to locate the
« no previous file with comments | « trunk/src/content/DEPS ('k') | trunk/src/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698