| Index: ui/aura/root_window_host_ozone.cc
|
| diff --git a/ui/aura/root_window_host_ozone.cc b/ui/aura/root_window_host_ozone.cc
|
| index 9f324c29dfea9f22e99788d427339a3fdf161b51..9bb2a2bcbd07229d851037c4e0dfec65847568bb 100644
|
| --- a/ui/aura/root_window_host_ozone.cc
|
| +++ b/ui/aura/root_window_host_ozone.cc
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace aura {
|
|
|
| -RootWindowHostOzone::RootWindowHostOzone(const gfx::Rect& bounds)
|
| +WindowTreeHostOzone::WindowTreeHostOzone(const gfx::Rect& bounds)
|
| : widget_(0),
|
| bounds_(bounds) {
|
| ui::OzonePlatform::Initialize();
|
| @@ -31,11 +31,11 @@ RootWindowHostOzone::RootWindowHostOzone(const gfx::Rect& bounds)
|
| CreateCompositor(GetAcceleratedWidget());
|
| }
|
|
|
| -RootWindowHostOzone::~RootWindowHostOzone() {
|
| +WindowTreeHostOzone::~WindowTreeHostOzone() {
|
| base::MessagePumpOzone::Current()->RemoveDispatcherForRootWindow(0);
|
| }
|
|
|
| -bool RootWindowHostOzone::Dispatch(const base::NativeEvent& ne) {
|
| +bool WindowTreeHostOzone::Dispatch(const base::NativeEvent& ne) {
|
| ui::Event* event = static_cast<ui::Event*>(ne);
|
| if (event->IsTouchEvent()) {
|
| ui::TouchEvent* touchev = static_cast<ui::TouchEvent*>(ne);
|
| @@ -50,83 +50,83 @@ bool RootWindowHostOzone::Dispatch(const base::NativeEvent& ne) {
|
| return true;
|
| }
|
|
|
| -RootWindow* RootWindowHostOzone::GetRootWindow() {
|
| +RootWindow* WindowTreeHostOzone::GetRootWindow() {
|
| return delegate_->AsRootWindow();
|
| }
|
|
|
| -gfx::AcceleratedWidget RootWindowHostOzone::GetAcceleratedWidget() {
|
| +gfx::AcceleratedWidget WindowTreeHostOzone::GetAcceleratedWidget() {
|
| return widget_;
|
| }
|
|
|
| -void RootWindowHostOzone::Show() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::Show() { NOTIMPLEMENTED(); }
|
|
|
| -void RootWindowHostOzone::Hide() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::Hide() { NOTIMPLEMENTED(); }
|
|
|
| -void RootWindowHostOzone::ToggleFullScreen() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::ToggleFullScreen() { NOTIMPLEMENTED(); }
|
|
|
| -gfx::Rect RootWindowHostOzone::GetBounds() const { return bounds_; }
|
| +gfx::Rect WindowTreeHostOzone::GetBounds() const { return bounds_; }
|
|
|
| -void RootWindowHostOzone::SetBounds(const gfx::Rect& bounds) {
|
| +void WindowTreeHostOzone::SetBounds(const gfx::Rect& bounds) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -gfx::Insets RootWindowHostOzone::GetInsets() const { return gfx::Insets(); }
|
| +gfx::Insets WindowTreeHostOzone::GetInsets() const { return gfx::Insets(); }
|
|
|
| -void RootWindowHostOzone::SetInsets(const gfx::Insets& insets) {
|
| +void WindowTreeHostOzone::SetInsets(const gfx::Insets& insets) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -gfx::Point RootWindowHostOzone::GetLocationOnNativeScreen() const {
|
| +gfx::Point WindowTreeHostOzone::GetLocationOnNativeScreen() const {
|
| return bounds_.origin();
|
| }
|
|
|
| -void RootWindowHostOzone::SetCapture() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::SetCapture() { NOTIMPLEMENTED(); }
|
|
|
| -void RootWindowHostOzone::ReleaseCapture() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::ReleaseCapture() { NOTIMPLEMENTED(); }
|
|
|
| -void RootWindowHostOzone::SetCursor(gfx::NativeCursor cursor) {
|
| +void WindowTreeHostOzone::SetCursor(gfx::NativeCursor cursor) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -bool RootWindowHostOzone::QueryMouseLocation(gfx::Point* location_return) {
|
| +bool WindowTreeHostOzone::QueryMouseLocation(gfx::Point* location_return) {
|
| NOTIMPLEMENTED();
|
| return false;
|
| }
|
|
|
| -bool RootWindowHostOzone::ConfineCursorToRootWindow() {
|
| +bool WindowTreeHostOzone::ConfineCursorToRootWindow() {
|
| NOTIMPLEMENTED();
|
| return false;
|
| }
|
|
|
| -void RootWindowHostOzone::UnConfineCursor() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::UnConfineCursor() { NOTIMPLEMENTED(); }
|
|
|
| -void RootWindowHostOzone::OnCursorVisibilityChanged(bool show) {
|
| +void WindowTreeHostOzone::OnCursorVisibilityChanged(bool show) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void RootWindowHostOzone::MoveCursorTo(const gfx::Point& location) {
|
| +void WindowTreeHostOzone::MoveCursorTo(const gfx::Point& location) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void RootWindowHostOzone::PostNativeEvent(
|
| +void WindowTreeHostOzone::PostNativeEvent(
|
| const base::NativeEvent& native_event) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void RootWindowHostOzone::OnDeviceScaleFactorChanged(
|
| +void WindowTreeHostOzone::OnDeviceScaleFactorChanged(
|
| float device_scale_factor) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void RootWindowHostOzone::PrepareForShutdown() { NOTIMPLEMENTED(); }
|
| +void WindowTreeHostOzone::PrepareForShutdown() { NOTIMPLEMENTED(); }
|
|
|
| // static
|
| -RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) {
|
| - return new RootWindowHostOzone(bounds);
|
| +WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
|
| + return new WindowTreeHostOzone(bounds);
|
| }
|
|
|
| // static
|
| -gfx::Size RootWindowHost::GetNativeScreenSize() {
|
| +gfx::Size WindowTreeHost::GetNativeScreenSize() {
|
| NOTIMPLEMENTED();
|
| return gfx::Size();
|
| }
|
|
|