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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 // 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 22 matching lines...) Expand all
33 #include "content/public/browser/content_browser_client.h" 33 #include "content/public/browser/content_browser_client.h"
34 #include "content/public/browser/dom_operation_notification_details.h" 34 #include "content/public/browser/dom_operation_notification_details.h"
35 #include "content/public/browser/interstitial_page_delegate.h" 35 #include "content/public/browser/interstitial_page_delegate.h"
36 #include "content/public/browser/invalidate_type.h" 36 #include "content/public/browser/invalidate_type.h"
37 #include "content/public/browser/notification_service.h" 37 #include "content/public/browser/notification_service.h"
38 #include "content/public/browser/notification_source.h" 38 #include "content/public/browser/notification_source.h"
39 #include "content/public/browser/storage_partition.h" 39 #include "content/public/browser/storage_partition.h"
40 #include "content/public/browser/user_metrics.h" 40 #include "content/public/browser/user_metrics.h"
41 #include "content/public/browser/web_contents_delegate.h" 41 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/common/bindings_policy.h" 42 #include "content/public/common/bindings_policy.h"
43 #include "content/public/common/page_transition_types.h"
44 #include "net/base/escape.h" 43 #include "net/base/escape.h"
45 #include "net/url_request/url_request_context_getter.h" 44 #include "net/url_request/url_request_context_getter.h"
45 #include "ui/base/page_transition_types.h"
46 46
47 using blink::WebDragOperation; 47 using blink::WebDragOperation;
48 using blink::WebDragOperationsMask; 48 using blink::WebDragOperationsMask;
49 49
50 namespace content { 50 namespace content {
51 namespace { 51 namespace {
52 52
53 void ResourceRequestHelper(ResourceDispatcherHostImpl* rdh, 53 void ResourceRequestHelper(ResourceDispatcherHostImpl* rdh,
54 int process_id, 54 int process_id,
55 int render_view_host_id, 55 int render_view_host_id,
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 void InterstitialPageImpl::DidNavigate( 463 void InterstitialPageImpl::DidNavigate(
464 RenderViewHost* render_view_host, 464 RenderViewHost* render_view_host,
465 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { 465 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
466 // A fast user could have navigated away from the page that triggered the 466 // A fast user could have navigated away from the page that triggered the
467 // interstitial while the interstitial was loading, that would have disabled 467 // interstitial while the interstitial was loading, that would have disabled
468 // us. In that case we can dismiss ourselves. 468 // us. In that case we can dismiss ourselves.
469 if (!enabled()) { 469 if (!enabled()) {
470 DontProceed(); 470 DontProceed();
471 return; 471 return;
472 } 472 }
473 if (PageTransitionCoreTypeIs(params.transition, 473 if (ui::PageTransitionCoreTypeIs(params.transition,
474 PAGE_TRANSITION_AUTO_SUBFRAME)) { 474 ui::PAGE_TRANSITION_AUTO_SUBFRAME)) {
475 // No need to handle navigate message from iframe in the interstitial page. 475 // No need to handle navigate message from iframe in the interstitial page.
476 return; 476 return;
477 } 477 }
478 478
479 // The RenderViewHost has loaded its contents, we can show it now. 479 // The RenderViewHost has loaded its contents, we can show it now.
480 if (!controller_->delegate()->IsHidden()) 480 if (!controller_->delegate()->IsHidden())
481 render_view_host_->GetView()->Show(); 481 render_view_host_->GetView()->Show();
482 controller_->delegate()->AttachInterstitialPage(this); 482 controller_->delegate()->AttachInterstitialPage(this);
483 483
484 RenderWidgetHostView* rwh_view = 484 RenderWidgetHostView* rwh_view =
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 912
913 web_contents->GetDelegateView()->TakeFocus(reverse); 913 web_contents->GetDelegateView()->TakeFocus(reverse);
914 } 914 }
915 915
916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
917 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 917 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
918 int active_match_ordinal, bool final_update) { 918 int active_match_ordinal, bool final_update) {
919 } 919 }
920 920
921 } // namespace content 921 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/debug_urls.cc ('k') | content/browser/frame_host/navigation_before_commit_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698