OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 return nullptr; | 377 return nullptr; |
378 | 378 |
379 if (!frame->GetPage() || frame->GetPage()->Suspended()) | 379 if (!frame->GetPage() || frame->GetPage()->Suspended()) |
380 return nullptr; | 380 return nullptr; |
381 | 381 |
382 WebNavigationPolicy policy = | 382 WebNavigationPolicy policy = |
383 EffectiveNavigationPolicy(navigation_policy, features); | 383 EffectiveNavigationPolicy(navigation_policy, features); |
384 DCHECK(frame->GetDocument()); | 384 DCHECK(frame->GetDocument()); |
385 Fullscreen::FullyExitFullscreen(*frame->GetDocument()); | 385 Fullscreen::FullyExitFullscreen(*frame->GetDocument()); |
386 | 386 |
387 WebViewImpl* new_view = ToWebViewImpl(web_view_->Client()->CreateView( | 387 WebViewBase* new_view = |
388 WebLocalFrameImpl::FromFrame(frame), | 388 static_cast<WebViewBase*>(web_view_->Client()->CreateView( |
389 WrappedResourceRequest(r.GetResourceRequest()), features, r.FrameName(), | 389 WebLocalFrameImpl::FromFrame(frame), |
390 policy, r.GetShouldSetOpener() == kNeverSetOpener || features.noopener)); | 390 WrappedResourceRequest(r.GetResourceRequest()), features, |
| 391 r.FrameName(), policy, |
| 392 r.GetShouldSetOpener() == kNeverSetOpener || features.noopener)); |
391 if (!new_view) | 393 if (!new_view) |
392 return nullptr; | 394 return nullptr; |
393 return new_view->GetPage(); | 395 return new_view->GetPage(); |
394 } | 396 } |
395 | 397 |
396 void ChromeClientImpl::DidOverscroll(const FloatSize& overscroll_delta, | 398 void ChromeClientImpl::DidOverscroll(const FloatSize& overscroll_delta, |
397 const FloatSize& accumulated_overscroll, | 399 const FloatSize& accumulated_overscroll, |
398 const FloatPoint& position_in_viewport, | 400 const FloatPoint& position_in_viewport, |
399 const FloatSize& velocity_in_viewport) { | 401 const FloatSize& velocity_in_viewport) { |
400 if (!web_view_->Client()) | 402 if (!web_view_->Client()) |
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 if (RuntimeEnabledFeatures::presentationEnabled()) | 1241 if (RuntimeEnabledFeatures::presentationEnabled()) |
1240 PresentationController::ProvideTo(frame, client->PresentationClient()); | 1242 PresentationController::ProvideTo(frame, client->PresentationClient()); |
1241 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1243 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
1242 ProvideAudioOutputDeviceClientTo(frame, | 1244 ProvideAudioOutputDeviceClientTo(frame, |
1243 new AudioOutputDeviceClientImpl(frame)); | 1245 new AudioOutputDeviceClientImpl(frame)); |
1244 } | 1246 } |
1245 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); | 1247 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); |
1246 } | 1248 } |
1247 | 1249 |
1248 } // namespace blink | 1250 } // namespace blink |
OLD | NEW |