| OLD | NEW |
| 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 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ | 5 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ |
| 6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ | 6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/threading/thread_local_storage.h" | 9 #include "base/threading/thread_local_storage.h" |
| 10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 const unsigned char* category_group_enabled, | 115 const unsigned char* category_group_enabled, |
| 116 const char* name, | 116 const char* name, |
| 117 unsigned long long id, | 117 unsigned long long id, |
| 118 double timestamp, | 118 double timestamp, |
| 119 int num_args, | 119 int num_args, |
| 120 const char** arg_names, | 120 const char** arg_names, |
| 121 const unsigned char* arg_types, | 121 const unsigned char* arg_types, |
| 122 const unsigned long long* arg_values, | 122 const unsigned long long* arg_values, |
| 123 const blink::WebConvertableToTraceFormat* convertable_values, | 123 const blink::WebConvertableToTraceFormat* convertable_values, |
| 124 unsigned char flags); | 124 unsigned char flags); |
| 125 // TODO(charliea): Remove the addTraceEvent methods without timestamps | |
| 126 // once Blink uses the new signature with timestamps | |
| 127 virtual TraceEventHandle addTraceEvent( | |
| 128 char phase, | |
| 129 const unsigned char* category_group_enabled, | |
| 130 const char* name, | |
| 131 unsigned long long id, | |
| 132 int num_args, | |
| 133 const char** arg_names, | |
| 134 const unsigned char* arg_types, | |
| 135 const unsigned long long* arg_values, | |
| 136 unsigned char flags); | |
| 137 virtual TraceEventHandle addTraceEvent( | |
| 138 char phase, | |
| 139 const unsigned char* category_group_enabled, | |
| 140 const char* name, | |
| 141 unsigned long long id, | |
| 142 int num_args, | |
| 143 const char** arg_names, | |
| 144 const unsigned char* arg_types, | |
| 145 const unsigned long long* arg_values, | |
| 146 const blink::WebConvertableToTraceFormat* convertable_values, | |
| 147 unsigned char flags); | |
| 148 virtual void updateTraceEventDuration( | 125 virtual void updateTraceEventDuration( |
| 149 const unsigned char* category_group_enabled, | 126 const unsigned char* category_group_enabled, |
| 150 const char* name, | 127 const char* name, |
| 151 TraceEventHandle); | 128 TraceEventHandle); |
| 152 virtual blink::WebData loadResource(const char* name); | 129 virtual blink::WebData loadResource(const char* name); |
| 153 virtual blink::WebString queryLocalizedString( | 130 virtual blink::WebString queryLocalizedString( |
| 154 blink::WebLocalizedString::Name name); | 131 blink::WebLocalizedString::Name name); |
| 155 virtual blink::WebString queryLocalizedString( | 132 virtual blink::WebString queryLocalizedString( |
| 156 blink::WebLocalizedString::Name name, int numeric_value); | 133 blink::WebLocalizedString::Name name, int numeric_value); |
| 157 virtual blink::WebString queryLocalizedString( | 134 virtual blink::WebString queryLocalizedString( |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 scoped_ptr<WebBluetoothImpl> bluetooth_; | 192 scoped_ptr<WebBluetoothImpl> bluetooth_; |
| 216 | 193 |
| 217 scoped_refptr<ThreadSafeSender> thread_safe_sender_; | 194 scoped_refptr<ThreadSafeSender> thread_safe_sender_; |
| 218 scoped_refptr<NotificationDispatcher> notification_dispatcher_; | 195 scoped_refptr<NotificationDispatcher> notification_dispatcher_; |
| 219 scoped_refptr<PushDispatcher> push_dispatcher_; | 196 scoped_refptr<PushDispatcher> push_dispatcher_; |
| 220 }; | 197 }; |
| 221 | 198 |
| 222 } // namespace content | 199 } // namespace content |
| 223 | 200 |
| 224 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ | 201 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ |
| OLD | NEW |