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

Side by Side Diff: ui/snapshot/snapshot_aura_unittest.cc

Issue 250113002: Move DefaultActivationClient to wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/snapshot/snapshot.gyp ('k') | ui/views/corewm/tooltip_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/snapshot/snapshot.h" 5 #include "ui/snapshot/snapshot.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/test/test_simple_task_runner.h" 8 #include "base/test/test_simple_task_runner.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/aura/test/aura_test_helper.h" 10 #include "ui/aura/test/aura_test_helper.h"
11 #include "ui/aura/test/test_screen.h" 11 #include "ui/aura/test/test_screen.h"
12 #include "ui/aura/test/test_window_delegate.h" 12 #include "ui/aura/test/test_window_delegate.h"
13 #include "ui/aura/test/test_windows.h" 13 #include "ui/aura/test/test_windows.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/aura/window_event_dispatcher.h" 15 #include "ui/aura/window_event_dispatcher.h"
16 #include "ui/compositor/layer.h" 16 #include "ui/compositor/layer.h"
17 #include "ui/compositor/test/context_factories_for_test.h" 17 #include "ui/compositor/test/context_factories_for_test.h"
18 #include "ui/compositor/test/draw_waiter_for_test.h" 18 #include "ui/compositor/test/draw_waiter_for_test.h"
19 #include "ui/gfx/canvas.h" 19 #include "ui/gfx/canvas.h"
20 #include "ui/gfx/gfx_paths.h" 20 #include "ui/gfx/gfx_paths.h"
21 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
22 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
23 #include "ui/gfx/size_conversions.h" 23 #include "ui/gfx/size_conversions.h"
24 #include "ui/gfx/transform.h" 24 #include "ui/gfx/transform.h"
25 #include "ui/gl/gl_implementation.h" 25 #include "ui/gl/gl_implementation.h"
26 #include "ui/wm/core/default_activation_client.h"
26 27
27 namespace ui { 28 namespace ui {
28 namespace { 29 namespace {
29 30
30 SkColor GetExpectedColorForPoint(int x, int y) { 31 SkColor GetExpectedColorForPoint(int x, int y) {
31 return SkColorSetRGB(std::min(x, 255), std::min(y, 255), 0); 32 return SkColorSetRGB(std::min(x, 255), std::min(y, 255), 0);
32 } 33 }
33 34
34 // Paint simple rectangle on the specified aura window. 35 // Paint simple rectangle on the specified aura window.
35 class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate { 36 class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 testing::Test::SetUp(); 87 testing::Test::SetUp();
87 88
88 // The ContextFactory must exist before any Compositors are created. 89 // The ContextFactory must exist before any Compositors are created.
89 // Snapshot test tests real drawing and readback, so needs pixel output. 90 // Snapshot test tests real drawing and readback, so needs pixel output.
90 bool enable_pixel_output = true; 91 bool enable_pixel_output = true;
91 ui::InitializeContextFactoryForTests(enable_pixel_output); 92 ui::InitializeContextFactoryForTests(enable_pixel_output);
92 93
93 helper_.reset( 94 helper_.reset(
94 new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); 95 new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
95 helper_->SetUp(); 96 helper_->SetUp();
97 new ::wm::DefaultActivationClient(helper_->root_window());
96 } 98 }
97 99
98 virtual void TearDown() OVERRIDE { 100 virtual void TearDown() OVERRIDE {
99 test_window_.reset(); 101 test_window_.reset();
100 delegate_.reset(); 102 delegate_.reset();
101 helper_->RunAllPendingInMessageLoop(); 103 helper_->RunAllPendingInMessageLoop();
102 helper_->TearDown(); 104 helper_->TearDown();
103 ui::TerminateContextFactoryForTests(); 105 ui::TerminateContextFactoryForTests();
104 testing::Test::TearDown(); 106 testing::Test::TearDown();
105 } 107 }
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 gfx::SizeF snapshot_size(test_bounds.size()); 280 gfx::SizeF snapshot_size(test_bounds.size());
279 snapshot_size.Scale(2.0f); 281 snapshot_size.Scale(2.0f);
280 282
281 gfx::Image snapshot = GrabSnapshotForTestWindow(); 283 gfx::Image snapshot = GrabSnapshotForTestWindow();
282 EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(), 284 EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
283 snapshot.Size().ToString()); 285 snapshot.Size().ToString());
284 EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2)); 286 EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2));
285 } 287 }
286 288
287 } // namespace ui 289 } // namespace ui
OLDNEW
« no previous file with comments | « ui/snapshot/snapshot.gyp ('k') | ui/views/corewm/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698