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

Side by Side Diff: trunk/src/content/browser/frame_host/interstitial_page_impl.cc

Issue 271863005: Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // WebContentsImpl will only call WebContentsWillBeDestroyed for interstitial 364 // WebContentsImpl will only call WebContentsWillBeDestroyed for interstitial
365 // pages that it knows about, pages that called 365 // pages that it knows about, pages that called
366 // WebContentsImpl::AttachInterstitialPage. But it's possible to have an 366 // WebContentsImpl::AttachInterstitialPage. But it's possible to have an
367 // interstitial page that never progressed that far. In that case, ensure that 367 // interstitial page that never progressed that far. In that case, ensure that
368 // this interstitial page is destroyed. (And if it was attached, and 368 // this interstitial page is destroyed. (And if it was attached, and
369 // OnNavigatingAwayOrTabClosing was called, it's safe to call 369 // OnNavigatingAwayOrTabClosing was called, it's safe to call
370 // OnNavigatingAwayOrTabClosing twice.) 370 // OnNavigatingAwayOrTabClosing twice.)
371 OnNavigatingAwayOrTabClosing(); 371 OnNavigatingAwayOrTabClosing();
372 } 372 }
373 373
374 bool InterstitialPageImpl::OnMessageReceived(
375 const IPC::Message& message,
376 RenderFrameHost* render_frame_host) {
377 return OnMessageReceived(message);
378 }
379
380 bool InterstitialPageImpl::OnMessageReceived(RenderFrameHost* render_frame_host, 374 bool InterstitialPageImpl::OnMessageReceived(RenderFrameHost* render_frame_host,
381 const IPC::Message& message) { 375 const IPC::Message& message) {
382 return OnMessageReceived(message); 376 return OnMessageReceived(message);
383 } 377 }
384 378
385 bool InterstitialPageImpl::OnMessageReceived(RenderViewHost* render_view_host, 379 bool InterstitialPageImpl::OnMessageReceived(RenderViewHost* render_view_host,
386 const IPC::Message& message) { 380 const IPC::Message& message) {
387 return OnMessageReceived(message); 381 return OnMessageReceived(message);
388 } 382 }
389 383
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 908
915 web_contents->GetDelegateView()->TakeFocus(reverse); 909 web_contents->GetDelegateView()->TakeFocus(reverse);
916 } 910 }
917 911
918 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 912 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
919 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 913 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
920 int active_match_ordinal, bool final_update) { 914 int active_match_ordinal, bool final_update) {
921 } 915 }
922 916
923 } // namespace content 917 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698