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

Unified Diff: ui/aura/test/aura_test_helper.cc

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « ui/aura/test/aura_test_helper.h ('k') | ui/views/corewm/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_helper.cc
===================================================================
--- ui/aura/test/aura_test_helper.cc (revision 165738)
+++ ui/aura/test/aura_test_helper.cc (working copy)
@@ -7,11 +7,11 @@
#include "base/message_loop.h"
#include "base/run_loop.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/default_capture_client.h"
#include "ui/aura/env.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/display_manager.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/shared/root_window_capture_client.h"
#include "ui/aura/single_display_manager.h"
#include "ui/aura/test/test_activation_client.h"
#include "ui/aura/test/test_screen.h"
@@ -55,8 +55,7 @@
stacking_client_.reset(new TestStackingClient(root_window_.get()));
test_activation_client_.reset(
new test::TestActivationClient(root_window_.get()));
- root_window_capture_client_.reset(
- new shared::RootWindowCaptureClient(root_window_.get()));
+ capture_client_.reset(new client::DefaultCaptureClient(root_window_.get()));
test_input_method_.reset(new ui::test::DummyInputMethod);
root_window_->SetProperty(
aura::client::kRootWindowInputMethodKey,
@@ -72,7 +71,7 @@
test_input_method_.reset();
stacking_client_.reset();
test_activation_client_.reset();
- root_window_capture_client_.reset();
+ capture_client_.reset();
focus_manager_.reset();
root_window_.reset();
test_screen_.reset();
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/views/corewm/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698