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

Side by Side Diff: content/child/npapi/webplugin_delegate_impl.h

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_ 5 #ifndef CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
6 #define CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_ 6 #define CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 static HCURSOR WINAPI SetCursorPatch(HCURSOR cursor); 379 static HCURSOR WINAPI SetCursorPatch(HCURSOR cursor);
380 380
381 // RegEnumKeyExW interceptor. 381 // RegEnumKeyExW interceptor.
382 static LONG WINAPI RegEnumKeyExWPatch( 382 static LONG WINAPI RegEnumKeyExWPatch(
383 HKEY key, DWORD index, LPWSTR name, LPDWORD name_size, LPDWORD reserved, 383 HKEY key, DWORD index, LPWSTR name, LPDWORD name_size, LPDWORD reserved,
384 LPWSTR class_name, LPDWORD class_size, PFILETIME last_write_time); 384 LPWSTR class_name, LPDWORD class_size, PFILETIME last_write_time);
385 385
386 // GetProcAddress intercepter for windowless plugins. 386 // GetProcAddress intercepter for windowless plugins.
387 static FARPROC WINAPI GetProcAddressPatch(HMODULE module, LPCSTR name); 387 static FARPROC WINAPI GetProcAddressPatch(HMODULE module, LPCSTR name);
388 388
389 #if defined(USE_AURA)
390 // WindowFromPoint patch for Flash windowless plugins. When flash receives 389 // WindowFromPoint patch for Flash windowless plugins. When flash receives
391 // mouse move messages it calls the WindowFromPoint API to eventually convert 390 // mouse move messages it calls the WindowFromPoint API to eventually convert
392 // the mouse coordinates to screen. We need to return the dummy plugin parent 391 // the mouse coordinates to screen. We need to return the dummy plugin parent
393 // window for Aura to ensure that these conversions occur correctly. 392 // window for Aura to ensure that these conversions occur correctly.
394 static HWND WINAPI WindowFromPointPatch(POINT point); 393 static HWND WINAPI WindowFromPointPatch(POINT point);
395 #endif
396 394
397 // The mouse hook proc which handles mouse capture in windowed plugins. 395 // The mouse hook proc which handles mouse capture in windowed plugins.
398 static LRESULT CALLBACK MouseHookProc(int code, WPARAM wParam, 396 static LRESULT CALLBACK MouseHookProc(int code, WPARAM wParam,
399 LPARAM lParam); 397 LPARAM lParam);
400 398
401 // Calls SetCapture/ReleaseCapture based on the message type. 399 // Calls SetCapture/ReleaseCapture based on the message type.
402 static void HandleCaptureForMessage(HWND window, UINT message); 400 static void HandleCaptureForMessage(HWND window, UINT message);
403 401
404 #elif defined(OS_MACOSX) && !defined(USE_AURA) 402 #elif defined(OS_MACOSX) && !defined(USE_AURA)
405 // Sets window_rect_ to |rect| 403 // Sets window_rect_ to |rect|
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 498
501 // True if NPP_New did not return an error. 499 // True if NPP_New did not return an error.
502 bool creation_succeeded_; 500 bool creation_succeeded_;
503 501
504 DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl); 502 DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
505 }; 503 };
506 504
507 } // namespace content 505 } // namespace content
508 506
509 #endif // CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_ 507 #endif // CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698