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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 798723004: Fix copying from interstitial pages on OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Verified test. Created 5 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 side-by-side diff with in-line comments
Download patch
« content/browser/frame_host/interstitial_page_impl.h ('K') | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | content/browser/web_contents/web_contents_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 05f980664b463b1a958203d03c01e31495ab56ac..476904cfa6991ed1d1481a58c8507f06df0e51c7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -645,6 +645,11 @@ RenderFrameHostImpl* WebContentsImpl::GetMainFrame() {
}
RenderFrameHost* WebContentsImpl::GetFocusedFrame() {
+ if (ShowingInterstitialPage()) {
+ InterstitialPageImpl* interstitial_page =
+ static_cast<InterstitialPageImpl*>(GetInterstitialPage());
+ return interstitial_page->GetFrameTree()->root()->current_frame_host();
+ }
if (!frame_tree_.GetFocusedFrame())
return NULL;
return frame_tree_.GetFocusedFrame()->current_frame_host();
« content/browser/frame_host/interstitial_page_impl.h ('K') | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | content/browser/web_contents/web_contents_impl_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698