OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" | 5 #include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 | 9 |
10 // url for "self". | 10 // url for "self". |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 } | 59 } |
60 window_ = window_handle; | 60 window_ = window_handle; |
61 #endif | 61 #endif |
62 } | 62 } |
63 | 63 |
64 return NPERR_NO_ERROR; | 64 return NPERR_NO_ERROR; |
65 } | 65 } |
66 | 66 |
67 #ifdef OS_WIN | 67 #ifdef OS_WIN |
68 void CALLBACK ExecuteGetJavascriptUrlTest::TimerProc( | 68 void CALLBACK ExecuteGetJavascriptUrlTest::TimerProc( |
69 HWND window, UINT message, UINT timer_id, unsigned long elapsed_time) { | 69 HWND window, UINT message, UINT_PTR timer_id, DWORD elapsed_time) { |
70 ExecuteGetJavascriptUrlTest* this_instance = | 70 ExecuteGetJavascriptUrlTest* this_instance = |
71 reinterpret_cast<ExecuteGetJavascriptUrlTest*> | 71 reinterpret_cast<ExecuteGetJavascriptUrlTest*> |
72 (::GetProp(window, L"Plugin_Instance")); | 72 (::GetProp(window, L"Plugin_Instance")); |
73 CHECK(this_instance); | 73 CHECK(this_instance); |
74 | 74 |
75 ::RemoveProp(window, L"Plugin_Instance"); | 75 ::RemoveProp(window, L"Plugin_Instance"); |
76 | 76 |
77 NPObject *window_obj = NULL; | 77 NPObject *window_obj = NULL; |
78 this_instance->HostFunctions()->getvalue(this_instance->id(), | 78 this_instance->HostFunctions()->getvalue(this_instance->id(), |
79 NPNVWindowNPObject, | 79 NPNVWindowNPObject, |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 SetError("Failed to obtain window location."); | 213 SetError("Failed to obtain window location."); |
214 SignalTestCompleted(); | 214 SignalTestCompleted(); |
215 break; | 215 break; |
216 default: | 216 default: |
217 SetError("Unexpected NewStream callback"); | 217 SetError("Unexpected NewStream callback"); |
218 break; | 218 break; |
219 } | 219 } |
220 } | 220 } |
221 | 221 |
222 } // namespace NPAPIClient | 222 } // namespace NPAPIClient |
OLD | NEW |