OLD | NEW |
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 "chrome/browser/ui/sync/one_click_signin_helper.h" | 5 #include "chrome/browser/ui/sync/one_click_signin_helper.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/profiles/profile_io_data.h" | 35 #include "chrome/browser/profiles/profile_io_data.h" |
36 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
37 #include "chrome/browser/search/search.h" | 37 #include "chrome/browser/search/search.h" |
38 #include "chrome/browser/signin/chrome_signin_client.h" | 38 #include "chrome/browser/signin/chrome_signin_client.h" |
39 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 39 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
40 #include "chrome/browser/signin/signin_manager.h" | 40 #include "chrome/browser/signin/signin_manager.h" |
41 #include "chrome/browser/signin/signin_manager_factory.h" | 41 #include "chrome/browser/signin/signin_manager_factory.h" |
42 #include "chrome/browser/signin/signin_names_io_thread.h" | 42 #include "chrome/browser/signin/signin_names_io_thread.h" |
43 #include "chrome/browser/sync/profile_sync_service.h" | 43 #include "chrome/browser/sync/profile_sync_service.h" |
44 #include "chrome/browser/sync/profile_sync_service_factory.h" | 44 #include "chrome/browser/sync/profile_sync_service_factory.h" |
45 #include "chrome/browser/sync/sync_prefs.h" | |
46 #include "chrome/browser/tab_contents/tab_util.h" | 45 #include "chrome/browser/tab_contents/tab_util.h" |
47 #include "chrome/browser/ui/browser_finder.h" | 46 #include "chrome/browser/ui/browser_finder.h" |
48 #include "chrome/browser/ui/browser_list.h" | 47 #include "chrome/browser/ui/browser_list.h" |
49 #include "chrome/browser/ui/browser_tabstrip.h" | 48 #include "chrome/browser/ui/browser_tabstrip.h" |
50 #include "chrome/browser/ui/browser_window.h" | 49 #include "chrome/browser/ui/browser_window.h" |
51 #include "chrome/browser/ui/chrome_pages.h" | 50 #include "chrome/browser/ui/chrome_pages.h" |
52 #include "chrome/browser/ui/sync/one_click_signin_histogram.h" | 51 #include "chrome/browser/ui/sync/one_click_signin_histogram.h" |
53 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" | 52 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" |
54 #include "chrome/browser/ui/sync/signin_histogram.h" | 53 #include "chrome/browser/ui/sync/signin_histogram.h" |
55 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" | 54 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" |
56 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" | 55 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" |
57 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 56 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
58 #include "chrome/common/chrome_version_info.h" | 57 #include "chrome/common/chrome_version_info.h" |
59 #include "chrome/common/net/url_util.h" | 58 #include "chrome/common/net/url_util.h" |
60 #include "chrome/common/pref_names.h" | 59 #include "chrome/common/pref_names.h" |
61 #include "chrome/common/profile_management_switches.h" | 60 #include "chrome/common/profile_management_switches.h" |
62 #include "chrome/common/url_constants.h" | 61 #include "chrome/common/url_constants.h" |
63 #include "components/autofill/core/common/password_form.h" | 62 #include "components/autofill/core/common/password_form.h" |
64 #include "components/password_manager/core/browser/password_manager.h" | 63 #include "components/password_manager/core/browser/password_manager.h" |
65 #include "components/signin/core/profile_oauth2_token_service.h" | 64 #include "components/signin/core/profile_oauth2_token_service.h" |
66 #include "components/signin/core/signin_client.h" | 65 #include "components/signin/core/signin_client.h" |
67 #include "components/signin/core/signin_error_controller.h" | 66 #include "components/signin/core/signin_error_controller.h" |
68 #include "components/signin/core/signin_manager_cookie_helper.h" | 67 #include "components/signin/core/signin_manager_cookie_helper.h" |
| 68 #include "components/sync_driver/sync_prefs.h" |
69 #include "content/public/browser/browser_thread.h" | 69 #include "content/public/browser/browser_thread.h" |
70 #include "content/public/browser/navigation_entry.h" | 70 #include "content/public/browser/navigation_entry.h" |
71 #include "content/public/browser/page_navigator.h" | 71 #include "content/public/browser/page_navigator.h" |
72 #include "content/public/browser/render_process_host.h" | 72 #include "content/public/browser/render_process_host.h" |
73 #include "content/public/browser/web_contents.h" | 73 #include "content/public/browser/web_contents.h" |
74 #include "content/public/browser/web_contents_view.h" | 74 #include "content/public/browser/web_contents_view.h" |
75 #include "content/public/common/frame_navigate_params.h" | 75 #include "content/public/common/frame_navigate_params.h" |
76 #include "content/public/common/page_transition_types.h" | 76 #include "content/public/common/page_transition_types.h" |
77 #include "google_apis/gaia/gaia_auth_util.h" | 77 #include "google_apis/gaia/gaia_auth_util.h" |
78 #include "google_apis/gaia/gaia_urls.h" | 78 #include "google_apis/gaia/gaia_urls.h" |
(...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1661 // If the web contents is showing a blank page and not about to be closed, | 1661 // If the web contents is showing a blank page and not about to be closed, |
1662 // redirect to the NTP or apps page. | 1662 // redirect to the NTP or apps page. |
1663 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && | 1663 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && |
1664 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { | 1664 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { |
1665 RedirectToNtpOrAppsPage( | 1665 RedirectToNtpOrAppsPage( |
1666 web_contents(), | 1666 web_contents(), |
1667 signin::GetSourceForPromoURL(original_continue_url_)); | 1667 signin::GetSourceForPromoURL(original_continue_url_)); |
1668 } | 1668 } |
1669 } | 1669 } |
1670 } | 1670 } |
OLD | NEW |