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

Side by Side Diff: components/navigation_interception/intercept_navigation_resource_throttle.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/navigation_interception/intercept_navigation_resource_throt tle.h" 5 #include "components/navigation_interception/intercept_navigation_resource_throt tle.h"
6 6
7 #include "components/navigation_interception/navigation_params.h" 7 #include "components/navigation_interception/navigation_params.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "content/public/browser/child_process_security_policy.h" 9 #include "content/public/browser/child_process_security_policy.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
11 #include "content/public/browser/render_process_host.h" 11 #include "content/public/browser/render_process_host.h"
12 #include "content/public/browser/resource_controller.h" 12 #include "content/public/browser/resource_controller.h"
13 #include "content/public/browser/resource_request_info.h" 13 #include "content/public/browser/resource_request_info.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/common/page_transition_types.h"
16 #include "content/public/common/referrer.h" 15 #include "content/public/common/referrer.h"
17 #include "net/http/http_response_headers.h" 16 #include "net/http/http_response_headers.h"
18 #include "net/url_request/url_request.h" 17 #include "net/url_request/url_request.h"
18 #include "ui/base/page_transition_types.h"
19 19
20 using content::BrowserThread; 20 using content::BrowserThread;
21 using content::ChildProcessSecurityPolicy; 21 using content::ChildProcessSecurityPolicy;
22 using content::PageTransition; 22 using ui::PageTransition;
23 using content::Referrer; 23 using content::Referrer;
24 using content::RenderProcessHost; 24 using content::RenderProcessHost;
25 using content::ResourceRequestInfo; 25 using content::ResourceRequestInfo;
26 26
27 namespace navigation_interception { 27 namespace navigation_interception {
28 28
29 namespace { 29 namespace {
30 30
31 void CheckIfShouldIgnoreNavigationOnUIThread( 31 void CheckIfShouldIgnoreNavigationOnUIThread(
32 int render_process_id, 32 int render_process_id,
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 141 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
142 142
143 if (should_ignore_navigation) { 143 if (should_ignore_navigation) {
144 controller()->CancelAndIgnore(); 144 controller()->CancelAndIgnore();
145 } else { 145 } else {
146 controller()->Resume(); 146 controller()->Resume();
147 } 147 }
148 } 148 }
149 149
150 } // namespace navigation_interception 150 } // namespace navigation_interception
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698