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

Unified Diff: ui/aura/window_tree_host_android.h

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ui/aura/window_tree_host_android.h
diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_android.h
similarity index 84%
copy from ui/aura/window_tree_host_ozone.h
copy to ui/aura/window_tree_host_android.h
index b356a3019978becb1a0c2f440461fef26756a930..5a58c79e8ebda853d45ac3627351ff673715f77f 100644
--- a/ui/aura/window_tree_host_ozone.h
+++ b/ui/aura/window_tree_host_android.h
@@ -16,11 +16,13 @@ class PlatformWindow;
namespace aura {
-class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
- public ui::PlatformWindowDelegate {
+class AURA_EXPORT WindowTreeHostAndroid : public WindowTreeHost,
+ public ui::PlatformWindowDelegate {
public:
- explicit WindowTreeHostOzone(const gfx::Rect& bounds);
- ~WindowTreeHostOzone() override;
+ explicit WindowTreeHostAndroid(const gfx::Rect& bounds);
+ ~WindowTreeHostAndroid() override;
+
+ static WindowTreeHostAndroid* GetHost();
protected:
// WindowTreeHost:
@@ -51,6 +53,7 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
float device_pixel_ratio) override;
void OnActivationChanged(bool active) override;
+ ui::InputMethod* GetInputMethod2() override;
// Platform-specific part of this WindowTreeHost.
scoped_ptr<ui::PlatformWindow> platform_window_;
@@ -61,7 +64,7 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
// Current Aura cursor.
gfx::NativeCursor current_cursor_;
- DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone);
+ DISALLOW_COPY_AND_ASSIGN(WindowTreeHostAndroid);
};
} // namespace aura

Powered by Google App Engine
This is Rietveld 408576698