ui/aura/window_tree_host_android.h - Issue 1284343005: NOT FOR REVIEW: Aura on Android - content shell compiles

Unified Diff: ui/aura/window_tree_host_android.h

Issue 1284343005: NOT FOR REVIEW: Aura on Android - content shell compiles Base URL: https://chromium.googlesource.com/chromium/src.git@build_ALL_patch

Patch Set: Created 5 years, 4 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

« content/shell/android/aura_shell_apk/src/org/chromium/aura_content_shell_apk/ContentShellActivity.java ('K') | « ui/aura/window_tree_host.cc ('k') | ui/aura/window_tree_host_android.cc » ('j') | ui/aura/window_tree_host_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 87%

copy from ui/aura/window_tree_host_ozone.h

copy to ui/aura/window_tree_host_android.h

index b356a3019978becb1a0c2f440461fef26756a930..b890558931cfd95d7bb855cfc19ad06439535559 100644

--- a/ui/aura/window_tree_host_ozone.h

+++ b/ui/aura/window_tree_host_android.h

@@ -16,11 +16,11 @@ 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;

protected:

// WindowTreeHost:

@@ -61,7 +61,7 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,

// Current Aura cursor.

gfx::NativeCursor current_cursor_;

- DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone);

+ DISALLOW_COPY_AND_ASSIGN(WindowTreeHostAndroid);

sadrul 2015/08/13 18:31:28 We should, of course, have a single WindowTreeHost

mfomitchev 2015/08/13 21:08:23 Oh yeah, for sure. The only real difference betwee

sadrul 2015/08/13 21:33:20 I think so, yeah. I played with the idea of introd

};

} // namespace aura