OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webui/signin/inline_login_handler_impl.h" | 5 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "chrome/browser/signin/signin_manager_factory.h" | 34 #include "chrome/browser/signin/signin_manager_factory.h" |
35 #include "chrome/browser/signin/signin_promo.h" | 35 #include "chrome/browser/signin/signin_promo.h" |
36 #include "chrome/browser/sync/profile_sync_service_factory.h" | 36 #include "chrome/browser/sync/profile_sync_service_factory.h" |
37 #include "chrome/browser/ui/browser_finder.h" | 37 #include "chrome/browser/ui/browser_finder.h" |
38 #include "chrome/browser/ui/browser_window.h" | 38 #include "chrome/browser/ui/browser_window.h" |
39 #include "chrome/browser/ui/chrome_pages.h" | 39 #include "chrome/browser/ui/chrome_pages.h" |
40 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" | 40 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" |
41 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" | 41 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" |
42 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 42 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
43 #include "chrome/browser/ui/user_manager.h" | 43 #include "chrome/browser/ui/user_manager.h" |
44 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" | 44 #include "chrome/browser/ui/webui/signin/get_auth_frame.h" |
45 #include "chrome/browser/ui/webui/signin/login_ui_service.h" | 45 #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
46 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" | 46 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
47 #include "chrome/common/url_constants.h" | 47 #include "chrome/common/url_constants.h" |
48 #include "chrome/grit/chromium_strings.h" | 48 #include "chrome/grit/chromium_strings.h" |
49 #include "chrome/grit/generated_resources.h" | 49 #include "chrome/grit/generated_resources.h" |
50 #include "components/browser_sync/browser/profile_sync_service.h" | 50 #include "components/browser_sync/browser/profile_sync_service.h" |
51 #include "components/signin/core/browser/about_signin_internals.h" | 51 #include "components/signin/core/browser/about_signin_internals.h" |
52 #include "components/signin/core/browser/account_tracker_service.h" | 52 #include "components/signin/core/browser/account_tracker_service.h" |
53 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 53 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
54 #include "components/signin/core/browser/signin_error_controller.h" | 54 #include "components/signin/core/browser/signin_error_controller.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 InlineLoginHandlerImpl::~InlineLoginHandlerImpl() {} | 463 InlineLoginHandlerImpl::~InlineLoginHandlerImpl() {} |
464 | 464 |
465 // This method is not called with webview sign in enabled. | 465 // This method is not called with webview sign in enabled. |
466 void InlineLoginHandlerImpl::DidCommitProvisionalLoadForFrame( | 466 void InlineLoginHandlerImpl::DidCommitProvisionalLoadForFrame( |
467 content::RenderFrameHost* render_frame_host, | 467 content::RenderFrameHost* render_frame_host, |
468 const GURL& url, | 468 const GURL& url, |
469 ui::PageTransition transition_type) { | 469 ui::PageTransition transition_type) { |
470 if (!web_contents()) | 470 if (!web_contents()) |
471 return; | 471 return; |
472 | 472 |
473 // Returns early if this is not a gaia iframe navigation. | 473 // Returns early if this is not a gaia webview navigation. |
474 const GURL kGaiaExtOrigin( | 474 content::RenderFrameHost* gaia_frame = |
475 GaiaUrls::GetInstance()->signin_completed_continue_url().GetOrigin()); | 475 signin::GetAuthFrame(web_contents(), "signin-frame"); |
476 content::RenderFrameHost* gaia_frame = InlineLoginUI::GetAuthFrame( | |
477 web_contents(), kGaiaExtOrigin, "signin-frame"); | |
478 if (render_frame_host != gaia_frame) | 476 if (render_frame_host != gaia_frame) |
479 return; | 477 return; |
480 | 478 |
481 // Loading any untrusted (e.g., HTTP) URLs in the privileged sign-in process | 479 // Loading any untrusted (e.g., HTTP) URLs in the privileged sign-in process |
482 // will require confirmation before the sign in takes effect. | 480 // will require confirmation before the sign in takes effect. |
| 481 const GURL kGaiaExtOrigin( |
| 482 GaiaUrls::GetInstance()->signin_completed_continue_url().GetOrigin()); |
483 if (!url.is_empty()) { | 483 if (!url.is_empty()) { |
484 GURL origin(url.GetOrigin()); | 484 GURL origin(url.GetOrigin()); |
485 if (url.spec() != url::kAboutBlankURL && | 485 if (url.spec() != url::kAboutBlankURL && |
486 origin != kGaiaExtOrigin && | 486 origin != kGaiaExtOrigin && |
487 !gaia::IsGaiaSignonRealm(origin)) { | 487 !gaia::IsGaiaSignonRealm(origin)) { |
488 confirm_untrusted_signin_ = true; | 488 confirm_untrusted_signin_ = true; |
489 } | 489 } |
490 } | 490 } |
491 } | 491 } |
492 | 492 |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
909 } | 909 } |
910 | 910 |
911 if (show_account_management) { | 911 if (show_account_management) { |
912 browser->window()->ShowAvatarBubbleFromAvatarButton( | 912 browser->window()->ShowAvatarBubbleFromAvatarButton( |
913 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, | 913 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, |
914 signin::ManageAccountsParams(), | 914 signin::ManageAccountsParams(), |
915 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); | 915 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); |
916 } | 916 } |
917 } | 917 } |
918 } | 918 } |
OLD | NEW |