| Index: third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h
|
| diff --git a/third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h b/third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h
|
| index b303ecb1bfae6cf05d9a4cc4f7329e42bac3ed26..148cba0dcaeb3fadaab9ac044b5d78cef7a5fc8c 100644
|
| --- a/third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h
|
| +++ b/third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h
|
| @@ -83,8 +83,12 @@ class SyncCallbackHelper final
|
| return new SuccessCallbackImpl(helper);
|
| }
|
|
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |handleEvent| below, not |HandleEvent|. */
|
| virtual void handleEvent() { m_helper->setError(FileError::kOK); }
|
|
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |handleEvent| below, not |HandleEvent|. */
|
| virtual void handleEvent(CallbackArg arg) { m_helper->setResult(arg); }
|
|
|
| DEFINE_INLINE_TRACE() {
|
|
|