| OLD | NEW |
| 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 "mojo/services/native_viewport/native_viewport.h" | 5 #include "mojo/services/native_viewport/native_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 "ui/events/event.h" | 9 #include "ui/events/event.h" |
| 10 #include "ui/events/event_utils.h" | 10 #include "ui/events/event_utils.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 scoped_ptr<ui::PlatformEventSource> event_source_; | 105 scoped_ptr<ui::PlatformEventSource> event_source_; |
| 106 scoped_ptr<ui::PlatformWindow> platform_window_; | 106 scoped_ptr<ui::PlatformWindow> platform_window_; |
| 107 NativeViewportDelegate* delegate_; | 107 NativeViewportDelegate* delegate_; |
| 108 gfx::Rect bounds_; | 108 gfx::Rect bounds_; |
| 109 | 109 |
| 110 DISALLOW_COPY_AND_ASSIGN(NativeViewportX11); | 110 DISALLOW_COPY_AND_ASSIGN(NativeViewportX11); |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 // static | 113 // static |
| 114 scoped_ptr<NativeViewport> NativeViewport::Create( | 114 scoped_ptr<NativeViewport> NativeViewport::Create( |
| 115 shell::Context* context, | 115 NativeViewportContext* context, |
| 116 NativeViewportDelegate* delegate) { | 116 NativeViewportDelegate* delegate) { |
| 117 return scoped_ptr<NativeViewport>(new NativeViewportX11(delegate)).Pass(); | 117 return scoped_ptr<NativeViewport>(new NativeViewportX11(delegate)).Pass(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace services | 120 } // namespace services |
| 121 } // namespace mojo | 121 } // namespace mojo |
| OLD | NEW |