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

Side by Side Diff: trunk/src/mojo/services/native_viewport/native_viewport_ozone.cc

Issue 410873003: Revert 284850 "aura: Use PlatformWindow from WindowTreeHostWin." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/events/event.h" 7 #include "ui/events/event.h"
8 #include "ui/events/platform/platform_event_dispatcher.h" 8 #include "ui/events/platform/platform_event_dispatcher.h"
9 #include "ui/events/platform/platform_event_source.h" 9 #include "ui/events/platform/platform_event_source.h"
10 #include "ui/ozone/public/cursor_factory_ozone.h" 10 #include "ui/ozone/public/cursor_factory_ozone.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 virtual void OnWindowStateChanged(ui::PlatformWindowState state) OVERRIDE {} 75 virtual void OnWindowStateChanged(ui::PlatformWindowState state) OVERRIDE {}
76 76
77 virtual void OnLostCapture() OVERRIDE {} 77 virtual void OnLostCapture() OVERRIDE {}
78 78
79 virtual void OnAcceleratedWidgetAvailable( 79 virtual void OnAcceleratedWidgetAvailable(
80 gfx::AcceleratedWidget widget) OVERRIDE { 80 gfx::AcceleratedWidget widget) OVERRIDE {
81 delegate_->OnAcceleratedWidgetAvailable(widget); 81 delegate_->OnAcceleratedWidgetAvailable(widget);
82 } 82 }
83 83
84 virtual void OnActivationChanged(bool active) OVERRIDE {}
85
86 scoped_ptr<ui::PlatformWindow> platform_window_; 84 scoped_ptr<ui::PlatformWindow> platform_window_;
87 NativeViewportDelegate* delegate_; 85 NativeViewportDelegate* delegate_;
88 86
89 DISALLOW_COPY_AND_ASSIGN(NativeViewportOzone); 87 DISALLOW_COPY_AND_ASSIGN(NativeViewportOzone);
90 }; 88 };
91 89
92 // static 90 // static
93 scoped_ptr<NativeViewport> NativeViewport::Create( 91 scoped_ptr<NativeViewport> NativeViewport::Create(
94 NativeViewportDelegate* delegate) { 92 NativeViewportDelegate* delegate) {
95 return scoped_ptr<NativeViewport>(new NativeViewportOzone(delegate)).Pass(); 93 return scoped_ptr<NativeViewport>(new NativeViewportOzone(delegate)).Pass();
96 } 94 }
97 95
98 } // namespace services 96 } // namespace services
99 } // namespace mojo 97 } // namespace mojo
OLDNEW
« no previous file with comments | « trunk/src/ash/test/ash_test_base.cc ('k') | trunk/src/mojo/services/native_viewport/native_viewport_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698