Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

Issue 2764313002: Move plugins to be stored in HTMLPlugInElement. (Closed)
Patch Set: Update comments about duplicating code Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 if (!result.scrollbar()) { 639 if (!result.scrollbar()) {
640 // Find out if the mouse is over a link, and if so, let our UI know... 640 // Find out if the mouse is over a link, and if so, let our UI know...
641 if (result.isLiveLink() && 641 if (result.isLiveLink() &&
642 !result.absoluteLinkURL().getString().isEmpty()) { 642 !result.absoluteLinkURL().getString().isEmpty()) {
643 url = result.absoluteLinkURL(); 643 url = result.absoluteLinkURL();
644 } else if (result.innerNode() && 644 } else if (result.innerNode() &&
645 (isHTMLObjectElement(*result.innerNode()) || 645 (isHTMLObjectElement(*result.innerNode()) ||
646 isHTMLEmbedElement(*result.innerNode()))) { 646 isHTMLEmbedElement(*result.innerNode()))) {
647 LayoutObject* object = result.innerNode()->layoutObject(); 647 LayoutObject* object = result.innerNode()->layoutObject();
648 if (object && object->isLayoutPart()) { 648 if (object && object->isLayoutPart()) {
649 FrameViewBase* frameViewBase = toLayoutPart(object)->frameViewBase(); 649 PluginView* pluginView = toLayoutPart(object)->plugin();
650 if (frameViewBase && frameViewBase->isPluginContainer()) { 650 if (pluginView && pluginView->isPluginContainer()) {
651 WebPluginContainerImpl* plugin = 651 WebPluginContainerImpl* plugin = toWebPluginContainerImpl(pluginView);
652 toWebPluginContainerImpl(frameViewBase);
653 url = plugin->plugin()->linkAtPosition( 652 url = plugin->plugin()->linkAtPosition(
654 result.roundedPointInInnerNodeFrame()); 653 result.roundedPointInInnerNodeFrame());
655 } 654 }
656 } 655 }
657 } 656 }
658 } 657 }
659 658
660 m_webView->client()->setMouseOverURL(url); 659 m_webView->client()->setMouseOverURL(url);
661 } 660 }
662 661
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 if (RuntimeEnabledFeatures::presentationEnabled()) 1227 if (RuntimeEnabledFeatures::presentationEnabled())
1229 PresentationController::provideTo(frame, client->presentationClient()); 1228 PresentationController::provideTo(frame, client->presentationClient());
1230 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { 1229 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) {
1231 provideAudioOutputDeviceClientTo(frame, 1230 provideAudioOutputDeviceClientTo(frame,
1232 new AudioOutputDeviceClientImpl(frame)); 1231 new AudioOutputDeviceClientImpl(frame));
1233 } 1232 }
1234 InstalledAppController::provideTo(frame, client->getRelatedAppsFetcher()); 1233 InstalledAppController::provideTo(frame, client->getRelatedAppsFetcher());
1235 } 1234 }
1236 1235
1237 } // namespace blink 1236 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698