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

Side by Side Diff: mojo/services/native_viewport/native_viewport_x11.cc

Issue 400413002: aura: Use PlatformWindow from WindowTreeHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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 | Annotate | Revision Log
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 "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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 96
97 virtual void OnLostCapture() OVERRIDE { 97 virtual void OnLostCapture() OVERRIDE {
98 } 98 }
99 99
100 virtual void OnAcceleratedWidgetAvailable( 100 virtual void OnAcceleratedWidgetAvailable(
101 gfx::AcceleratedWidget widget) OVERRIDE { 101 gfx::AcceleratedWidget widget) OVERRIDE {
102 delegate_->OnAcceleratedWidgetAvailable(widget); 102 delegate_->OnAcceleratedWidgetAvailable(widget);
103 } 103 }
104 104
105 virtual void OnActivationChanged(bool active) OVERRIDE {}
106
105 scoped_ptr<ui::PlatformEventSource> event_source_; 107 scoped_ptr<ui::PlatformEventSource> event_source_;
106 scoped_ptr<ui::PlatformWindow> platform_window_; 108 scoped_ptr<ui::PlatformWindow> platform_window_;
107 NativeViewportDelegate* delegate_; 109 NativeViewportDelegate* delegate_;
108 gfx::Rect bounds_; 110 gfx::Rect bounds_;
109 111
110 DISALLOW_COPY_AND_ASSIGN(NativeViewportX11); 112 DISALLOW_COPY_AND_ASSIGN(NativeViewportX11);
111 }; 113 };
112 114
113 // static 115 // static
114 scoped_ptr<NativeViewport> NativeViewport::Create( 116 scoped_ptr<NativeViewport> NativeViewport::Create(
115 shell::Context* context, 117 shell::Context* context,
116 NativeViewportDelegate* delegate) { 118 NativeViewportDelegate* delegate) {
117 return scoped_ptr<NativeViewport>(new NativeViewportX11(delegate)).Pass(); 119 return scoped_ptr<NativeViewport>(new NativeViewportX11(delegate)).Pass();
118 } 120 }
119 121
120 } // namespace services 122 } // namespace services
121 } // namespace mojo 123 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698