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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 6027012: Fix so that login errors are shown from login/oobe screens.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.h ('k') | chrome/browser/chromeos/login/mock_authenticator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
===================================================================
--- chrome/browser/chromeos/login/login_utils.cc (revision 71337)
+++ chrome/browser/chromeos/login/login_utils.cc (working copy)
@@ -23,6 +23,7 @@
#include "chrome/browser/chromeos/cros/login_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
+#include "chrome/browser/chromeos/login/background_view.h"
#include "chrome/browser/chromeos/login/cookie_fetcher.h"
#include "chrome/browser/chromeos/login/google_authenticator.h"
#include "chrome/browser/chromeos/login/language_switch_menu.h"
@@ -99,7 +100,8 @@
class LoginUtilsImpl : public LoginUtils {
public:
LoginUtilsImpl()
- : browser_launch_enabled_(true) {
+ : browser_launch_enabled_(true),
+ background_view_(NULL) {
}
// Invoked after the user has successfully logged in. This launches a browser
@@ -143,6 +145,12 @@
Profile* profile,
const GaiaAuthConsumer::ClientLoginResult& credentials);
+ // Sets the current background view.
+ virtual void SetBackgroundView(chromeos::BackgroundView* background_view);
+
+ // Gets the current background view.
+ virtual chromeos::BackgroundView* GetBackgroundView();
+
private:
// Check user's profile for kApplicationLocale setting.
void RespectLocalePreference(PrefService* pref);
@@ -150,6 +158,9 @@
// Indicates if DoBrowserLaunch will actually launch the browser or not.
bool browser_launch_enabled_;
+ // The current background view.
+ chromeos::BackgroundView* background_view_;
+
DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
};
@@ -531,6 +542,14 @@
}
}
+void LoginUtilsImpl::SetBackgroundView(BackgroundView* background_view) {
+ background_view_ = background_view;
+}
+
+BackgroundView* LoginUtilsImpl::GetBackgroundView() {
+ return background_view_;
+}
+
LoginUtils* LoginUtils::Get() {
return LoginUtilsWrapper::GetInstance()->get();
}
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.h ('k') | chrome/browser/chromeos/login/mock_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698