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

Unified Diff: ash/host/ash_window_tree_host_ozone.cc

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win build Created 5 years, 2 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 | « no previous file | ash/host/ash_window_tree_host_win.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 85b3faef7e50dbabbed64587d27a1ca5f85c3ea5..d4b679c396a6ecea2c3663c92160ca828f9f06a7 100644
--- a/ash/host/ash_window_tree_host_ozone.cc
+++ b/ash/host/ash_window_tree_host_ozone.cc
@@ -12,7 +12,7 @@
#include "base/command_line.h"
#include "base/trace_event/trace_event.h"
#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host_ozone.h"
+#include "ui/aura/window_tree_host_platform.h"
#include "ui/events/event_processor.h"
#include "ui/events/null_event_targeter.h"
#include "ui/gfx/geometry/insets.h"
@@ -25,7 +25,7 @@ namespace ash {
namespace {
class AshWindowTreeHostOzone : public AshWindowTreeHost,
- public aura::WindowTreeHostOzone {
+ public aura::WindowTreeHostPlatform {
public:
explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
~AshWindowTreeHostOzone() override;
@@ -61,7 +61,7 @@ class AshWindowTreeHostOzone : public AshWindowTreeHost,
};
AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds)
- : aura::WindowTreeHostOzone(initial_bounds), transformer_helper_(this) {
+ : aura::WindowTreeHostPlatform(initial_bounds), transformer_helper_(this) {
transformer_helper_.Init();
}
@@ -127,7 +127,7 @@ void AshWindowTreeHostOzone::OnCursorVisibilityChangedNative(bool show) {
}
void AshWindowTreeHostOzone::SetBounds(const gfx::Rect& bounds) {
- WindowTreeHostOzone::SetBounds(bounds);
+ WindowTreeHostPlatform::SetBounds(bounds);
ConfineCursorToRootWindow();
}
« no previous file with comments | « no previous file | ash/host/ash_window_tree_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698