Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 PPAPI_THUNK_INSTANCE_API_H_ | 5 #ifndef PPAPI_THUNK_INSTANCE_API_H_ |
| 6 #define PPAPI_THUNK_INSTANCE_API_H_ | 6 #define PPAPI_THUNK_INSTANCE_API_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ppapi/c/dev/ppb_console_dev.h" | 10 #include "ppapi/c/dev/ppb_console_dev.h" |
| 11 #include "ppapi/c/dev/ppb_text_input_dev.h" | 11 #include "ppapi/c/dev/ppb_text_input_dev.h" |
| 12 #include "ppapi/c/dev/ppb_trace_event_dev.h" | |
|
brettw
2013/01/02 22:44:25
I think you can revert this file.
elijahtaylor1
2013/01/03 22:11:35
Done.
| |
| 12 #include "ppapi/c/dev/ppb_url_util_dev.h" | 13 #include "ppapi/c/dev/ppb_url_util_dev.h" |
| 13 #include "ppapi/c/pp_bool.h" | 14 #include "ppapi/c/pp_bool.h" |
| 14 #include "ppapi/c/pp_completion_callback.h" | 15 #include "ppapi/c/pp_completion_callback.h" |
| 15 #include "ppapi/c/pp_size.h" | 16 #include "ppapi/c/pp_size.h" |
| 16 #include "ppapi/c/pp_time.h" | 17 #include "ppapi/c/pp_time.h" |
| 17 #include "ppapi/c/ppb_audio_config.h" | 18 #include "ppapi/c/ppb_audio_config.h" |
| 18 #include "ppapi/c/ppb_gamepad.h" | 19 #include "ppapi/c/ppb_gamepad.h" |
| 19 #include "ppapi/c/ppb_instance.h" | 20 #include "ppapi/c/ppb_instance.h" |
| 20 #include "ppapi/c/ppb_mouse_cursor.h" | 21 #include "ppapi/c/ppb_mouse_cursor.h" |
| 21 #include "ppapi/c/private/pp_content_decryptor.h" | 22 #include "ppapi/c/private/pp_content_decryptor.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 141 uint32_t anchor) = 0; | 142 uint32_t anchor) = 0; |
| 142 | 143 |
| 143 // Zoom. | 144 // Zoom. |
| 144 virtual void ZoomChanged(PP_Instance instance, double factor) = 0; | 145 virtual void ZoomChanged(PP_Instance instance, double factor) = 0; |
| 145 virtual void ZoomLimitsChanged(PP_Instance instance, | 146 virtual void ZoomLimitsChanged(PP_Instance instance, |
| 146 double minimum_factor, | 147 double minimum_factor, |
| 147 double maximium_factor) = 0; | 148 double maximium_factor) = 0; |
| 148 // Testing and URLUtil. | 149 // Testing and URLUtil. |
| 149 virtual PP_Var GetDocumentURL(PP_Instance instance, | 150 virtual PP_Var GetDocumentURL(PP_Instance instance, |
| 150 PP_URLComponents_Dev* components) = 0; | 151 PP_URLComponents_Dev* components) = 0; |
| 152 | |
| 151 #if !defined(OS_NACL) | 153 #if !defined(OS_NACL) |
| 152 // Content Decryptor. | 154 // Content Decryptor. |
| 153 virtual void NeedKey(PP_Instance instance, | 155 virtual void NeedKey(PP_Instance instance, |
| 154 PP_Var key_system, | 156 PP_Var key_system, |
| 155 PP_Var session_id, | 157 PP_Var session_id, |
| 156 PP_Var init_data) = 0; | 158 PP_Var init_data) = 0; |
| 157 virtual void KeyAdded(PP_Instance instance, | 159 virtual void KeyAdded(PP_Instance instance, |
| 158 PP_Var key_system, | 160 PP_Var key_system, |
| 159 PP_Var session_id) = 0; | 161 PP_Var session_id) = 0; |
| 160 virtual void KeyMessage(PP_Instance instance, | 162 virtual void KeyMessage(PP_Instance instance, |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 PP_URLComponents_Dev* components) = 0; | 201 PP_URLComponents_Dev* components) = 0; |
| 200 #endif // !defined(OS_NACL) | 202 #endif // !defined(OS_NACL) |
| 201 | 203 |
| 202 static const ApiID kApiID = API_ID_PPB_INSTANCE; | 204 static const ApiID kApiID = API_ID_PPB_INSTANCE; |
| 203 }; | 205 }; |
| 204 | 206 |
| 205 } // namespace thunk | 207 } // namespace thunk |
| 206 } // namespace ppapi | 208 } // namespace ppapi |
| 207 | 209 |
| 208 #endif // PPAPI_THUNK_INSTANCE_API_H_ | 210 #endif // PPAPI_THUNK_INSTANCE_API_H_ |
| OLD | NEW |