Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: chrome/browser/ui/views/profiles/signin_view_controller.cc

Issue 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge conflicts resolved. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/profiles/signin_view_controller.cc
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller.cc b/chrome/browser/ui/views/profiles/signin_view_controller.cc
index 487275529d3c5deebf8f1d6a8df4157123ef853c..850e75218b01c09371916587e8368dadc2e31265 100644
--- a/chrome/browser/ui/views/profiles/signin_view_controller.cc
+++ b/chrome/browser/ui/views/profiles/signin_view_controller.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/signin/signin_promo.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/signin/inline_login_ui.h"
+#include "chrome/browser/ui/webui/signin/get_auth_frame.h"
#include "chrome/common/url_constants.h"
#include "components/constrained_window/constrained_window_views.h"
#include "components/signin/core/browser/signin_error_controller.h"
@@ -157,8 +157,8 @@ class ModalSigninDelegate : public views::DialogDelegateView,
// views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override {
- auto auth_web_contents = InlineLoginUI::GetAuthFrameWebContents(
- content_view_->GetWebContents(), GURL(), "signin-frame");
+ auto auth_web_contents = signin::GetAuthFrameWebContents(
+ content_view_->GetWebContents(), "signin-frame");
if (auth_web_contents) {
if (auth_web_contents->GetController().CanGoBack())
auth_web_contents->GetController().GoBack();
@@ -171,8 +171,8 @@ class ModalSigninDelegate : public views::DialogDelegateView,
// content::WebContentsDelegate
void LoadingStateChanged(
content::WebContents* source, bool to_different_document) override {
- auto auth_web_contents = InlineLoginUI::GetAuthFrameWebContents(
- content_view_->GetWebContents(), GURL(), "signin-frame");
+ auto auth_web_contents = signin::GetAuthFrameWebContents(
+ content_view_->GetWebContents(), "signin-frame");
if (auth_web_contents) {
if (auth_web_contents->GetController().CanGoBack())
host_view_->ShowBackArrow();
« no previous file with comments | « chrome/browser/chromeos/login/test/oobe_base_test.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698