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_navigation_throttle
.h" | 5 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle
.h" |
6 | 6 |
7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" | 7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "content/public/browser/navigation_handle.h" | 9 #include "content/public/browser/navigation_handle.h" |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 // The MergeSessionLoadPage will be deleted by the interstitial page once it | 38 // The MergeSessionLoadPage will be deleted by the interstitial page once it |
39 // is closed. | 39 // is closed. |
40 (new chromeos::MergeSessionLoadPage( | 40 (new chromeos::MergeSessionLoadPage( |
41 navigation_handle()->GetWebContents(), navigation_handle()->GetURL(), | 41 navigation_handle()->GetWebContents(), navigation_handle()->GetURL(), |
42 base::Bind(&MergeSessionNavigationThrottle::OnBlockingPageComplete, | 42 base::Bind(&MergeSessionNavigationThrottle::OnBlockingPageComplete, |
43 weak_factory_.GetWeakPtr()))) | 43 weak_factory_.GetWeakPtr()))) |
44 ->Show(); | 44 ->Show(); |
45 return content::NavigationThrottle::DEFER; | 45 return content::NavigationThrottle::DEFER; |
46 } | 46 } |
47 | 47 |
| 48 const char* MergeSessionNavigationThrottle::GetNameForLogging() { |
| 49 return "MergeSessionNavigationThrottle"; |
| 50 } |
| 51 |
48 void MergeSessionNavigationThrottle::OnBlockingPageComplete() { | 52 void MergeSessionNavigationThrottle::OnBlockingPageComplete() { |
49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 53 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
50 navigation_handle()->Resume(); | 54 navigation_handle()->Resume(); |
51 } | 55 } |
OLD | NEW |