OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h
" | 5 #include "chrome/browser/chromeos/login/signin/merge_session_resource_throttle.h
" |
6 | 6 |
7 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" | 7 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" |
8 #include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.
h" | 8 #include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.
h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
11 #include "content/public/browser/resource_controller.h" | |
12 #include "content/public/browser/resource_request_info.h" | 11 #include "content/public/browser/resource_request_info.h" |
13 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
14 #include "net/url_request/url_request.h" | 13 #include "net/url_request/url_request.h" |
15 | 14 |
16 using content::BrowserThread; | 15 using content::BrowserThread; |
17 using content::RenderViewHost; | 16 using content::RenderViewHost; |
18 using content::WebContents; | 17 using content::WebContents; |
19 | 18 |
20 namespace { | 19 namespace { |
21 | 20 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 weak_factory_.GetWeakPtr()))); | 69 weak_factory_.GetWeakPtr()))); |
71 *defer = true; | 70 *defer = true; |
72 } | 71 } |
73 | 72 |
74 const char* MergeSessionResourceThrottle::GetNameForLogging() const { | 73 const char* MergeSessionResourceThrottle::GetNameForLogging() const { |
75 return "MergeSessionResourceThrottle"; | 74 return "MergeSessionResourceThrottle"; |
76 } | 75 } |
77 | 76 |
78 void MergeSessionResourceThrottle::OnBlockingPageComplete() { | 77 void MergeSessionResourceThrottle::OnBlockingPageComplete() { |
79 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 78 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
80 controller()->Resume(); | 79 Resume(); |
81 } | 80 } |
OLD | NEW |