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

Side by Side Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 666673005: Explicitly coerce PostDispatchAction to uint32_t in DispatchEvent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_enums
Patch Set: sigh. Windows. Created 6 years, 2 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 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 "ui/ozone/platform/egltest/ozone_platform_egltest.h" 5 #include "ui/ozone/platform/egltest/ozone_platform_egltest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 bool EgltestWindow::CanDispatchEvent(const ui::PlatformEvent& ne) { 148 bool EgltestWindow::CanDispatchEvent(const ui::PlatformEvent& ne) {
149 return true; 149 return true;
150 } 150 }
151 151
152 uint32_t EgltestWindow::DispatchEvent(const ui::PlatformEvent& native_event) { 152 uint32_t EgltestWindow::DispatchEvent(const ui::PlatformEvent& native_event) {
153 DispatchEventFromNativeUiEvent( 153 DispatchEventFromNativeUiEvent(
154 native_event, 154 native_event,
155 base::Bind(&PlatformWindowDelegate::DispatchEvent, 155 base::Bind(&PlatformWindowDelegate::DispatchEvent,
156 base::Unretained(delegate_))); 156 base::Unretained(delegate_)));
157 157
158 return ui::POST_DISPATCH_STOP_PROPAGATION; 158 return ui::kPostDispatchStopPropagation;
159 } 159 }
160 160
161 // EGL surface wrapper for libeglplatform_shim. 161 // EGL surface wrapper for libeglplatform_shim.
162 // 162 //
163 // This just manages the native window lifetime using 163 // This just manages the native window lifetime using
164 // ShimGetNativeWindow & ShimReleaseNativeWindow. 164 // ShimGetNativeWindow & ShimReleaseNativeWindow.
165 class SurfaceOzoneEgltest : public SurfaceOzoneEGL { 165 class SurfaceOzoneEgltest : public SurfaceOzoneEGL {
166 public: 166 public:
167 SurfaceOzoneEgltest(ShimNativeWindowId window_id, 167 SurfaceOzoneEgltest(ShimNativeWindowId window_id,
168 LibeglplatformShimLoader* eglplatform_shim) 168 LibeglplatformShimLoader* eglplatform_shim)
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 377
378 } // namespace 378 } // namespace
379 379
380 OzonePlatform* CreateOzonePlatformEgltest() { 380 OzonePlatform* CreateOzonePlatformEgltest() {
381 OzonePlatformEgltest* platform = new OzonePlatformEgltest; 381 OzonePlatformEgltest* platform = new OzonePlatformEgltest;
382 platform->Initialize(); 382 platform->Initialize();
383 return platform; 383 return platform;
384 } 384 }
385 385
386 } // namespace ui 386 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698