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

Side by Side Diff: components/view_manager/native_viewport/platform_viewport_x11.cc

Issue 1149083010: Mandoline: Remove native_viewport.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More cleanup Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/view_manager/native_viewport/platform_viewport.h" 5 #include "components/view_manager/native_viewport/platform_viewport.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
9 #include "mojo/converters/geometry/geometry_type_converters.h" 10 #include "mojo/converters/geometry/geometry_type_converters.h"
10 #include "mojo/converters/input_events/input_events_type_converters.h" 11 #include "mojo/converters/input_events/input_events_type_converters.h"
11 #include "mojo/converters/input_events/mojo_extended_key_event_data.h" 12 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
12 #include "ui/events/event.h" 13 #include "ui/events/event.h"
13 #include "ui/events/event_utils.h" 14 #include "ui/events/event_utils.h"
14 #include "ui/events/platform/platform_event_dispatcher.h" 15 #include "ui/events/platform/platform_event_dispatcher.h"
15 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
16 #include "ui/platform_window/platform_window.h" 17 #include "ui/platform_window/platform_window.h"
17 #include "ui/platform_window/platform_window_delegate.h" 18 #include "ui/platform_window/platform_window_delegate.h"
18 #include "ui/platform_window/x11/x11_window.h" 19 #include "ui/platform_window/x11/x11_window.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void Close() override { platform_window_->Close(); } 63 void Close() override { platform_window_->Close(); }
63 64
64 gfx::Size GetSize() override { return metrics_->size.To<gfx::Size>(); } 65 gfx::Size GetSize() override { return metrics_->size.To<gfx::Size>(); }
65 66
66 void SetBounds(const gfx::Rect& bounds) override { 67 void SetBounds(const gfx::Rect& bounds) override {
67 platform_window_->SetBounds(bounds); 68 platform_window_->SetBounds(bounds);
68 } 69 }
69 70
70 // ui::PlatformWindowDelegate: 71 // ui::PlatformWindowDelegate:
71 void OnBoundsChanged(const gfx::Rect& new_bounds) override { 72 void OnBoundsChanged(const gfx::Rect& new_bounds) override {
72 metrics_->size = mojo::Size::From(new_bounds.size()); 73 // TODO(fsamuel): Use the real device_scale_factor.
73 delegate_->OnMetricsChanged(metrics_.Clone()); 74 delegate_->OnMetricsChanged(new_bounds.size(),
75 1.f /* device_scale_factor */);
74 } 76 }
75 77
76 void OnDamageRect(const gfx::Rect& damaged_region) override {} 78 void OnDamageRect(const gfx::Rect& damaged_region) override {}
77 79
78 void DispatchEvent(ui::Event* event) override { 80 void DispatchEvent(ui::Event* event) override {
79 mojo::EventPtr mojo_event(mojo::Event::From(*event)); 81 mojo::EventPtr mojo_event(mojo::Event::From(*event));
80 if (event->IsMouseWheelEvent()) { 82 if (event->IsMouseWheelEvent()) {
81 // Mojo's event type has a different meaning for wheel events. Convert 83 // Mojo's event type has a different meaning for wheel events. Convert
82 // between the two. 84 // between the two.
83 ui::MouseWheelEvent* wheel_event = 85 ui::MouseWheelEvent* wheel_event =
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 158
157 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11); 159 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11);
158 }; 160 };
159 161
160 // static 162 // static
161 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { 163 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
162 return make_scoped_ptr(new PlatformViewportX11(delegate)); 164 return make_scoped_ptr(new PlatformViewportX11(delegate));
163 } 165 }
164 166
165 } // namespace native_viewport 167 } // namespace native_viewport
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698