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

Side by Side Diff: chrome/browser/ui/webui/signin/login_ui_service.cc

Issue 2785753003: Exclude building signin view controller and its delegate on ChromeOS (Closed)
Patch Set: Exclude SigninViewController on ChromeOS Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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/webui/signin/login_ui_service.h" 5 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/signin/signin_promo.h" 9 #include "chrome/browser/signin/signin_promo.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS); 63 signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS);
64 #endif 64 #endif
65 } 65 }
66 66
67 void LoginUIService::DisplayLoginResult(Browser* browser, 67 void LoginUIService::DisplayLoginResult(Browser* browser,
68 const base::string16& error_message, 68 const base::string16& error_message,
69 const base::string16& email) { 69 const base::string16& email) {
70 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
71 // ChromeOS doesn't have the avatar bubble so it never calls this function. 71 // ChromeOS doesn't have the avatar bubble so it never calls this function.
72 NOTREACHED(); 72 NOTREACHED();
73 #endif 73 #else
74 last_login_result_ = error_message; 74 last_login_result_ = error_message;
75 last_login_error_email_ = email; 75 last_login_error_email_ = email;
76 if (!error_message.empty()) { 76 if (!error_message.empty()) {
77 if (browser) 77 if (browser)
78 browser->ShowModalSigninErrorWindow(); 78 browser->signin_view_controller()->ShowModalSigninErrorDialog(browser);
79 else 79 else
80 UserManagerProfileDialog::DisplayErrorMessage(); 80 UserManagerProfileDialog::DisplayErrorMessage();
81 } else if (browser) { 81 } else if (browser) {
82 browser->window()->ShowAvatarBubbleFromAvatarButton( 82 browser->window()->ShowAvatarBubbleFromAvatarButton(
83 error_message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN 83 error_message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN
84 : BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR, 84 : BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR,
85 signin::ManageAccountsParams(), 85 signin::ManageAccountsParams(),
86 signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS, false); 86 signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS, false);
87 } 87 }
88 #endif
88 } 89 }
89 90
90 const base::string16& LoginUIService::GetLastLoginResult() const { 91 const base::string16& LoginUIService::GetLastLoginResult() const {
91 return last_login_result_; 92 return last_login_result_;
92 } 93 }
93 94
94 const base::string16& LoginUIService::GetLastLoginErrorEmail() const { 95 const base::string16& LoginUIService::GetLastLoginErrorEmail() const {
95 return last_login_error_email_; 96 return last_login_error_email_;
96 } 97 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/webui/signin/login_ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698