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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 NavigationPolicy userPolicy = *policy; | 311 NavigationPolicy userPolicy = *policy; |
312 navigationPolicyFromMouseEvent(buttonNumber, ctrl, shift, alt, meta, | 312 navigationPolicyFromMouseEvent(buttonNumber, ctrl, shift, alt, meta, |
313 &userPolicy); | 313 &userPolicy); |
314 | 314 |
315 // When the input event suggests a download, but the navigation was initiated | 315 // When the input event suggests a download, but the navigation was initiated |
316 // by script, we should not override it. | 316 // by script, we should not override it. |
317 if (userPolicy == NavigationPolicyDownload && | 317 if (userPolicy == NavigationPolicyDownload && |
318 *policy != NavigationPolicyIgnore) | 318 *policy != NavigationPolicyIgnore) |
319 return; | 319 return; |
320 | 320 |
321 // User and app agree that we want a new window; let the app override the deco
rations. | 321 // User and app agree that we want a new window; let the app override the |
| 322 // decorations. |
322 if (userPolicy == NavigationPolicyNewWindow && | 323 if (userPolicy == NavigationPolicyNewWindow && |
323 *policy == NavigationPolicyNewPopup) | 324 *policy == NavigationPolicyNewPopup) |
324 return; | 325 return; |
325 *policy = userPolicy; | 326 *policy = userPolicy; |
326 } | 327 } |
327 | 328 |
328 WebNavigationPolicy getNavigationPolicy(const WindowFeatures& features) { | 329 WebNavigationPolicy getNavigationPolicy(const WindowFeatures& features) { |
329 // If our default configuration was modified by a script or wasn't | 330 // If our default configuration was modified by a script or wasn't |
330 // created by a user gesture, then show as a popup. Else, let this | 331 // created by a user gesture, then show as a popup. Else, let this |
331 // new window be opened as a toplevel window. | 332 // new window be opened as a toplevel window. |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1169 if (RuntimeEnabledFeatures::presentationEnabled()) | 1170 if (RuntimeEnabledFeatures::presentationEnabled()) |
1170 PresentationController::provideTo(frame, client->presentationClient()); | 1171 PresentationController::provideTo(frame, client->presentationClient()); |
1171 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) | 1172 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) |
1172 provideAudioOutputDeviceClientTo(frame, | 1173 provideAudioOutputDeviceClientTo(frame, |
1173 AudioOutputDeviceClientImpl::create()); | 1174 AudioOutputDeviceClientImpl::create()); |
1174 if (RuntimeEnabledFeatures::installedAppEnabled()) | 1175 if (RuntimeEnabledFeatures::installedAppEnabled()) |
1175 InstalledAppController::provideTo(frame, client->installedAppClient()); | 1176 InstalledAppController::provideTo(frame, client->installedAppClient()); |
1176 } | 1177 } |
1177 | 1178 |
1178 } // namespace blink | 1179 } // namespace blink |
OLD | NEW |