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

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: Created 5 years, 11 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
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 a1f733458b9693baf9d3397305e7ac51ec7ccb6b..83e4c5aff4afd6b8d12c57eeaab22f36c71c78a1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -626,6 +626,11 @@ RenderFrameHost* WebContentsImpl::GetMainFrame() {
}
RenderFrameHost* WebContentsImpl::GetFocusedFrame() {
+ if (ShowingInterstitialPage()) {
+ InterstitialPageImpl* interstitial_page =
+ (InterstitialPageImpl*)GetInterstitialPage();
palmer 2015/04/20 23:51:58 Use a C++-style cast here. I don't know exactly w
+ return interstitial_page->GetFrameTree()->root()->current_frame_host();
+ }
if (!frame_tree_.GetFocusedFrame())
return NULL;
return frame_tree_.GetFocusedFrame()->current_frame_host();

Powered by Google App Engine
This is Rietveld 408576698