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

Unified Diff: chrome/test/base/browser_with_test_window_test.cc

Issue 9696008: TestScreen shouldn't be marked aura export (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 9 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: chrome/test/base/browser_with_test_window_test.cc
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 209f884a12d005f315ba4d4ba72363ff5ddce008..25386443892e032800b31ec57c288f6b9527e591 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -22,6 +22,7 @@
#if defined(USE_AURA)
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_activation_client.h"
+#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
#endif
@@ -50,6 +51,7 @@ void BrowserWithTestWindowTest::SetUp() {
browser_->SetWindowForTesting(window_.get());
#if defined(USE_AURA)
root_window_.reset(new aura::RootWindow);
+ gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
test_activation_client_.reset(
new aura::test::TestActivationClient(root_window_.get()));
test_stacking_client_.reset(
« no previous file with comments | « chrome/browser/ui/views/accessibility_event_router_views_unittest.cc ('k') | content/test/test_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698