| Index: content/renderer/screen_orientation/screen_orientation_dispatcher.cc
|
| diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher.cc b/content/renderer/screen_orientation/screen_orientation_dispatcher.cc
|
| index e67cc73634ec79a3541815223011e5f6d3f4f661..7e5bcfcd382aa85cf0c6add2a6d6517c39dd9dae 100644
|
| --- a/content/renderer/screen_orientation/screen_orientation_dispatcher.cc
|
| +++ b/content/renderer/screen_orientation/screen_orientation_dispatcher.cc
|
| @@ -44,8 +44,7 @@ void ScreenOrientationDispatcher::OnLockSuccess(
|
| }
|
|
|
| void ScreenOrientationDispatcher::OnLockError(
|
| - int request_id,
|
| - blink::WebLockOrientationCallback::ErrorType error) {
|
| + int request_id, blink::WebLockOrientationError error) {
|
| blink::WebLockOrientationCallback* callback =
|
| pending_callbacks_.Lookup(request_id);
|
| if (!callback)
|
| @@ -57,8 +56,7 @@ void ScreenOrientationDispatcher::OnLockError(
|
| void ScreenOrientationDispatcher::CancelPendingLocks() {
|
| for (CallbackMap::Iterator<blink::WebLockOrientationCallback>
|
| iterator(&pending_callbacks_); !iterator.IsAtEnd(); iterator.Advance()) {
|
| - iterator.GetCurrentValue()->onError(
|
| - blink::WebLockOrientationCallback::ErrorTypeCanceled);
|
| + iterator.GetCurrentValue()->onError(blink::WebLockOrientationErrorCanceled);
|
| pending_callbacks_.Remove(iterator.GetCurrentKey());
|
| }
|
| }
|
|
|