Chromium Code Reviews| 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 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 925 layer_tree_view->RegisterSelection(WebSelection(selection)); | 925 layer_tree_view->RegisterSelection(WebSelection(selection)); |
| 926 } | 926 } |
| 927 | 927 |
| 928 bool ChromeClientImpl::HasOpenedPopup() const { | 928 bool ChromeClientImpl::HasOpenedPopup() const { |
| 929 return web_view_->HasOpenedPopup(); | 929 return web_view_->HasOpenedPopup(); |
| 930 } | 930 } |
| 931 | 931 |
| 932 PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, | 932 PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, |
| 933 HTMLSelectElement& select) { | 933 HTMLSelectElement& select) { |
| 934 NotifyPopupOpeningObservers(); | 934 NotifyPopupOpeningObservers(); |
| 935 | |
| 936 if (frame.GetDocument()->GetSettings()->GetPagePopupsSuppressed()) | |
|
Rick Byers
2017/05/25 21:06:17
nit: in vollick's previous CL he bailed out before
asimjour
2017/05/25 22:47:32
Done.
| |
| 937 return nullptr; | |
| 938 | |
| 935 if (WebViewBase::UseExternalPopupMenus()) | 939 if (WebViewBase::UseExternalPopupMenus()) |
| 936 return new ExternalPopupMenu(frame, select, *web_view_); | 940 return new ExternalPopupMenu(frame, select, *web_view_); |
| 937 | 941 |
| 938 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); | 942 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); |
| 939 return PopupMenuImpl::Create(this, select); | 943 return PopupMenuImpl::Create(this, select); |
| 940 } | 944 } |
| 941 | 945 |
| 942 PagePopup* ChromeClientImpl::OpenPagePopup(PagePopupClient* client) { | 946 PagePopup* ChromeClientImpl::OpenPagePopup(PagePopupClient* client) { |
| 943 return web_view_->OpenPagePopup(client); | 947 return web_view_->OpenPagePopup(client); |
| 944 } | 948 } |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1273 if (RuntimeEnabledFeatures::presentationEnabled()) | 1277 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1274 PresentationController::ProvideTo(frame, client->PresentationClient()); | 1278 PresentationController::ProvideTo(frame, client->PresentationClient()); |
| 1275 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1279 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
| 1276 ProvideAudioOutputDeviceClientTo(frame, | 1280 ProvideAudioOutputDeviceClientTo(frame, |
| 1277 new AudioOutputDeviceClientImpl(frame)); | 1281 new AudioOutputDeviceClientImpl(frame)); |
| 1278 } | 1282 } |
| 1279 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); | 1283 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); |
| 1280 } | 1284 } |
| 1281 | 1285 |
| 1282 } // namespace blink | 1286 } // namespace blink |
| OLD | NEW |