| 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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 if (WebLayerTreeView* layer_tree_view = widget->GetLayerTreeView()) | 924 if (WebLayerTreeView* layer_tree_view = widget->GetLayerTreeView()) |
| 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 if (frame.GetDocument()->GetSettings()->GetPagePopupsSuppressed()) |
| 935 return nullptr; |
| 936 |
| 934 NotifyPopupOpeningObservers(); | 937 NotifyPopupOpeningObservers(); |
| 935 if (WebViewBase::UseExternalPopupMenus()) | 938 if (WebViewBase::UseExternalPopupMenus()) |
| 936 return new ExternalPopupMenu(frame, select, *web_view_); | 939 return new ExternalPopupMenu(frame, select, *web_view_); |
| 937 | 940 |
| 938 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); | 941 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); |
| 939 return PopupMenuImpl::Create(this, select); | 942 return PopupMenuImpl::Create(this, select); |
| 940 } | 943 } |
| 941 | 944 |
| 942 PagePopup* ChromeClientImpl::OpenPagePopup(PagePopupClient* client) { | 945 PagePopup* ChromeClientImpl::OpenPagePopup(PagePopupClient* client) { |
| 943 return web_view_->OpenPagePopup(client); | 946 return web_view_->OpenPagePopup(client); |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1273 if (RuntimeEnabledFeatures::presentationEnabled()) | 1276 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1274 PresentationController::ProvideTo(frame, client->PresentationClient()); | 1277 PresentationController::ProvideTo(frame, client->PresentationClient()); |
| 1275 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1278 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
| 1276 ProvideAudioOutputDeviceClientTo(frame, | 1279 ProvideAudioOutputDeviceClientTo(frame, |
| 1277 new AudioOutputDeviceClientImpl(frame)); | 1280 new AudioOutputDeviceClientImpl(frame)); |
| 1278 } | 1281 } |
| 1279 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); | 1282 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); |
| 1280 } | 1283 } |
| 1281 | 1284 |
| 1282 } // namespace blink | 1285 } // namespace blink |
| OLD | NEW |