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

Unified Diff: ash/host/ash_window_tree_host_ozone.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 11 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.cc ('k') | ash/host/ash_window_tree_host_x11.cc » ('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 c6360801833f99147cade5340049fb6348287f66..68700b4ac18e01dddb1ff91b3284da5659a6065c 100644
--- a/ash/host/ash_window_tree_host_ozone.cc
+++ b/ash/host/ash_window_tree_host_ozone.cc
@@ -32,7 +32,7 @@ class AshWindowTreeHostOzone : public AshWindowTreeHost,
explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
~AshWindowTreeHostOzone() override;
- private:
+ protected:
// AshWindowTreeHost:
void ToggleFullScreen() override;
bool ConfineCursorToRootWindow() override;
@@ -54,6 +54,7 @@ class AshWindowTreeHostOzone : public AshWindowTreeHost,
ui::EventDispatchDetails DispatchKeyEventPostIME(
ui::KeyEvent* event) override;
+ private:
// Temporarily disable the tap-to-click feature. Used on CrOS.
void SetTapToClickPaused(bool state);
@@ -162,11 +163,4 @@ void AshWindowTreeHostOzone::SetTapToClickPaused(bool state) {
} // namespace
-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);
-}
-
} // namespace ash
« no previous file with comments | « ash/host/ash_window_tree_host.cc ('k') | ash/host/ash_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698