| Index: third_party/grpc/include/grpc++/impl/codegen/sync_cxx11.h
|
| diff --git a/third_party/WebKit/Source/core/events/NavigatorEvents.h b/third_party/grpc/include/grpc++/impl/codegen/sync_cxx11.h
|
| similarity index 81%
|
| copy from third_party/WebKit/Source/core/events/NavigatorEvents.h
|
| copy to third_party/grpc/include/grpc++/impl/codegen/sync_cxx11.h
|
| index 787d16b41893005b43abebd52e284f05a3079507..49105476473e9d5a4e6b161b1e8132583f5d8800 100644
|
| --- a/third_party/WebKit/Source/core/events/NavigatorEvents.h
|
| +++ b/third_party/grpc/include/grpc++/impl/codegen/sync_cxx11.h
|
| @@ -1,5 +1,7 @@
|
| /*
|
| - * Copyright (C) 2013 Google Inc. All rights reserved.
|
| + *
|
| + * Copyright 2015-2016, Google Inc.
|
| + * All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -26,23 +28,22 @@
|
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + *
|
| */
|
|
|
| -#ifndef NavigatorEvents_h
|
| -#define NavigatorEvents_h
|
| -
|
| -#include "wtf/Allocator.h"
|
| +#ifndef GRPCXX_IMPL_CODEGEN_SYNC_CXX11_H
|
| +#define GRPCXX_IMPL_CODEGEN_SYNC_CXX11_H
|
|
|
| -namespace blink {
|
| +#include <condition_variable>
|
| +#include <mutex>
|
|
|
| -class Navigator;
|
| +namespace grpc {
|
|
|
| -class NavigatorEvents {
|
| - STATIC_ONLY(NavigatorEvents);
|
| -public:
|
| - static long maxTouchPoints(Navigator&);
|
| -};
|
| +using std::condition_variable;
|
| +using std::mutex;
|
| +using std::lock_guard;
|
| +using std::unique_lock;
|
|
|
| -} // namespace blink
|
| +} // namespace grpc
|
|
|
| -#endif // NavigatorEvents_h
|
| +#endif // GRPCXX_IMPL_CODEGEN_SYNC_CXX11_H
|
|
|