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

Unified Diff: ash/test/test_metro_viewer_process_host.cc

Issue 277753002: Makes construction of (ash)RemoteWindowTreeHostWin explicit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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 side-by-side diff with in-line comments
Download patch
Index: ash/test/test_metro_viewer_process_host.cc
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc
index 5dd448cc7d700ede040b0f03c0e5bfed1c8c3f1a..85df3e21cbccfb6f64faad4fb6aaa9ea2dbdf6f5 100644
--- a/ash/test/test_metro_viewer_process_host.cc
+++ b/ash/test/test_metro_viewer_process_host.cc
@@ -8,13 +8,15 @@
#include "base/logging.h"
#include "ui/aura/remote_window_tree_host_win.h"
+#include "ui/gfx/win/dpi.h"
namespace ash {
namespace test {
TestMetroViewerProcessHost::TestMetroViewerProcessHost(
base::SingleThreadTaskRunner* ipc_task_runner)
- : MetroViewerProcessHost(ipc_task_runner), closed_unexpectedly_(false) {
+ : MetroViewerProcessHost(ipc_task_runner),
+ closed_unexpectedly_(false) {
}
TestMetroViewerProcessHost::~TestMetroViewerProcessHost() {
@@ -30,8 +32,8 @@ void TestMetroViewerProcessHost::OnSetTargetSurface(
float device_scale) {
DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface;
HWND hwnd = reinterpret_cast<HWND>(target_surface);
- aura::RemoteWindowTreeHostWin::Instance()->
- InitializeRemoteWindowAndScaleFactor(hwnd, device_scale);
+ gfx::InitDeviceScaleFactor(device_scale);
+ aura::RemoteWindowTreeHostWin::Instance()->SetRemoteWindowHandle(hwnd);
aura::RemoteWindowTreeHostWin::Instance()->Connected(this);
}
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698