Index: chrome/browser/ui/webui/signin/inline_login_handler.cc |
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc |
index 76c75005041bb3b2418275777cd95aaae8355f86..e13188bb5b8b210aba12d7c4d4384db8842c2c17 100644 |
--- a/chrome/browser/ui/webui/signin/inline_login_handler.cc |
+++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc |
@@ -14,11 +14,11 @@ |
#include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/signin/signin_promo.h" |
-#include "chrome/browser/ui/browser_finder.h" |
#include "chrome/browser/ui/browser_navigator.h" |
#include "chrome/browser/ui/browser_navigator_params.h" |
#include "chrome/browser/ui/signin_view_controller_delegate.h" |
#include "chrome/browser/ui/user_manager.h" |
+#include "chrome/browser/ui/webui/signin/signin_utils.h" |
#include "chrome/common/pref_names.h" |
#include "components/metrics/metrics_pref_names.h" |
#include "components/prefs/pref_service.h" |
@@ -30,18 +30,6 @@ |
#include "google_apis/gaia/gaia_urls.h" |
#include "net/base/url_util.h" |
-namespace { |
- |
-Browser* GetDesktopBrowser(content::WebUI* web_ui) { |
- Browser* browser = chrome::FindBrowserWithWebContents( |
- web_ui->GetWebContents()); |
- if (!browser) |
- browser = chrome::FindLastActiveWithProfile(Profile::FromWebUI(web_ui)); |
- return browser; |
-} |
- |
-} // namespace |
- |
InlineLoginHandler::InlineLoginHandler() : weak_ptr_factory_(this) {} |
InlineLoginHandler::~InlineLoginHandler() {} |
@@ -278,14 +266,14 @@ void InlineLoginHandler::HandleSwitchToFullTabMessage( |
void InlineLoginHandler::HandleNavigationButtonClicked( |
const base::ListValue* args) { |
- Browser* browser = GetDesktopBrowser(web_ui()); |
+ Browser* browser = signin::GetDesktopBrowser(web_ui()); |
DCHECK(browser); |
browser->signin_view_controller()->delegate()->PerformNavigation(); |
} |
void InlineLoginHandler::HandleDialogClose(const base::ListValue* args) { |
- Browser* browser = GetDesktopBrowser(web_ui()); |
+ Browser* browser = signin::GetDesktopBrowser(web_ui()); |
// If the dialog was opened in the User Manager browser will be null here. |
if (browser) |
browser->CloseModalSigninWindow(); |