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

Side by Side Diff: content/renderer/mus/compositor_mus_connection_unittest.cc

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/renderer/mus/compositor_mus_connection.h" 5 #include "content/renderer/mus/compositor_mus_connection.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 private: 139 private:
140 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient); 140 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient);
141 }; 141 };
142 142
143 // Implementation of RenderWidget for testing, performs no initialization. 143 // Implementation of RenderWidget for testing, performs no initialization.
144 class TestRenderWidget : public content::RenderWidget { 144 class TestRenderWidget : public content::RenderWidget {
145 public: 145 public:
146 explicit TestRenderWidget(content::CompositorDependencies* compositor_deps) 146 explicit TestRenderWidget(content::CompositorDependencies* compositor_deps)
147 : content::RenderWidget(compositor_deps, 147 : content::RenderWidget(compositor_deps,
148 blink::WebPopupTypeNone, 148 blink::WebPopupTypeNone,
149 blink::WebScreenInfo(), 149 content::ScreenInfo(),
150 true, 150 true,
151 false, 151 false,
152 false) {} 152 false) {}
153 153
154 protected: 154 protected:
155 ~TestRenderWidget() override {} 155 ~TestRenderWidget() override {}
156 156
157 private: 157 private:
158 DISALLOW_COPY_AND_ASSIGN(TestRenderWidget); 158 DISALLOW_COPY_AND_ASSIGN(TestRenderWidget);
159 }; 159 };
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 EXPECT_FALSE(ack_callback.get()); 485 EXPECT_FALSE(ack_callback.get());
486 486
487 VerifyAndRunQueues(true, true); 487 VerifyAndRunQueues(true, true);
488 488
489 // The ack callback should have been called 489 // The ack callback should have been called
490 EXPECT_TRUE(test_callback->called()); 490 EXPECT_TRUE(test_callback->called());
491 EXPECT_EQ(EventResult::HANDLED, test_callback->result()); 491 EXPECT_EQ(EventResult::HANDLED, test_callback->result());
492 } 492 }
493 493
494 } // namespace content 494 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698