|
|
Merge 182894 - 3rd attempt
> Added interstitial page for merge session. This page will let us delay loading of Google properties during ChromeOS cookie session restore at login (aka /MergeSession).
>
> The interstitial page will show 3 seconds of no UI (white tab) followed with up to 7 seconds of UI with only "Loading..." message showing in tabs. For huge majority of cases, that secondary UI won't show since merge session will probably complete by then.
>
> BUG= 171980
> TEST=added merge_session_load_page_unittest.cc
> TBR=sky
>
> Review URL: https://codereview.chromium.org/12256046
TBR=zelidrag@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=184221
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+70 lines, -1 line) |
Patch |
 |
M |
chrome/browser/browser_resources.grd
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/login_utils.cc
|
View
|
|
3 chunks |
+7 lines, -0 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/chromeos/login/merge_session_load_page.h
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/chromeos/login/merge_session_load_page.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/chromeos/login/merge_session_throttle.h
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/chromeos/login/merge_session_throttle.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/mock_user_manager.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/oauth2_login_manager.cc
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/oauth_login_manager.h
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager.h
|
View
|
|
2 chunks |
+21 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager_impl.h
|
View
|
|
3 chunks |
+7 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager_impl.cc
|
View
|
|
3 chunks |
+20 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
View
|
|
2 chunks |
+6 lines, -0 lines |
0 comments
|
Download
|
|
A + |
chrome/browser/resources/chromeos/merge_session_load.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/chrome_browser_chromeos.gypi
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/chrome_tests_unit.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|
Chromium Code Reviews
Issue
12335051:
Merge 182894 - 3rd attempt (Closed)
