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

Unified Diff: ash/host/ash_window_tree_host_ozone.cc

Issue 1107733006: Unified Desktop: hook up ash to allow unified desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: AshWindowTreeHostUnified Created 5 years, 8 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
« no previous file with comments | « ash/host/ash_window_tree_host_init_params.cc ('k') | ash/host/ash_window_tree_host_unified.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_ozone.cc
diff --git a/ash/host/ash_window_tree_host_ozone.cc b/ash/host/ash_window_tree_host_ozone.cc
index cb2ec66e33dc4e08f0b2924c5a14473b2c71dac1..e45bf5dda86670ee98c28e612ee4149e87e66e90 100644
--- a/ash/host/ash_window_tree_host_ozone.cc
+++ b/ash/host/ash_window_tree_host_ozone.cc
@@ -5,6 +5,7 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/host/ash_window_tree_host_init_params.h"
+#include "ash/host/ash_window_tree_host_unified.h"
#include "ash/host/root_window_transformer.h"
#include "ash/host/transformer_helper.h"
#include "base/command_line.h"
@@ -144,6 +145,8 @@ void AshWindowTreeHostOzone::SetTapToClickPaused(bool state) {
AshWindowTreeHost* AshWindowTreeHost::Create(
const AshWindowTreeHostInitParams& init_params) {
+ if (init_params.offscreen)
+ return new AshWindowTreeHostUnified(init_params.initial_bounds);
return new AshWindowTreeHostOzone(init_params.initial_bounds);
}
« no previous file with comments | « ash/host/ash_window_tree_host_init_params.cc ('k') | ash/host/ash_window_tree_host_unified.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698