summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorsamli <samli@chromium.org>2016-01-19 20:12:20 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-20 04:13:47 +0000
commit6d8217fba41cd7fae3251d09e7af2b26b5e12737 (patch)
tree86a0a2e1ec24777607cb4760889c87b24bc73635 /printing
parent33ced7a1ea60824e88c132d727dd864b37b0e6e2 (diff)
downloadchromium_src-6d8217fba41cd7fae3251d09e7af2b26b5e12737.zip
chromium_src-6d8217fba41cd7fae3251d09e7af2b26b5e12737.tar.gz
chromium_src-6d8217fba41cd7fae3251d09e7af2b26b5e12737.tar.bz2
Reland of move remote tree host and some related input and metro_driver code (patchset #1 id:1 of https://codereview.chromium.org/1602403002/ )
Reason for revert: Didn't help, looks like the slave is out of disk space. Original issue's description: > Revert of Remove remote tree host and some related input and metro_driver code (patchset #5 id:80001 of https://codereview.chromium.org/1586843002/ ) > > Reason for revert: > Suspecting that this is breaking the Webkit Win (dbg) builder. > > First failed build: > https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28dbg%29/builds/88362 > > Original issue's description: > > Remove remote tree host and some related input and metro_driver code > > > > Part of continued stripping out of Metro/Win8/Immersive mode. > > > > BUG=558054 > > > > Committed: https://crrev.com/5cc04f70e424020d8afe49bdc4c1c76683f0ea7b > > Cr-Commit-Position: refs/heads/master@{#370068} > > TBR=sky@chromium.org,thestig@chromium.org,shuchen@chromium.org,ananta@chromium.org,dpranke@chromium.org,scottmg@chromium.org > NOTRY=true > NOPRESUBMIT=true > NOTREECHECKS=true > BUG=558054 > > Committed: https://crrev.com/0e3a9fd80a26f1fce889200d330d79e64d7a2586 > Cr-Commit-Position: refs/heads/master@{#370290} TBR=ananta@chromium.org,dpranke@chromium.org,scottmg@chromium.org,shuchen@chromium.org,sky@chromium.org,thestig@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=558054 Review URL: https://codereview.chromium.org/1605253002 Cr-Commit-Position: refs/heads/master@{#370300}
Diffstat (limited to 'printing')
-rw-r--r--printing/printing_context_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 4eff722..8a6dc17a 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -17,8 +17,8 @@
#include "printing/printing_utils.h"
#include "printing/units.h"
#include "skia/ext/skia_utils_win.h"
-#include "ui/aura/remote_window_tree_host_win.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
namespace printing {