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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 3201003: Fixed error message bubbles according to the latest mocks (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Comments resolved Created 10 years, 4 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/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller.h
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index 62ac1253476f2512568bf708a3d7714b80268fd4..1306c15a3af8605d0620d976ba858544a7e89b87 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -14,11 +14,11 @@
#include "base/timer.h"
#include "chrome/browser/chromeos/login/captcha_view.h"
#include "chrome/browser/chromeos/login/login_status_consumer.h"
+#include "chrome/browser/chromeos/login/message_bubble.h"
#include "chrome/browser/chromeos/login/password_changed_view.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/user_controller.h"
#include "chrome/browser/chromeos/wm_message_listener.h"
-#include "chrome/browser/views/info_bubble.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "gfx/size.h"
@@ -41,7 +41,7 @@ class MessageBubble;
class ExistingUserController : public WmMessageListener::Observer,
public UserController::Delegate,
public LoginStatusConsumer,
- public InfoBubbleDelegate,
+ public MessageBubbleDelegate,
public CaptchaView::Delegate,
public PasswordChangedView::Delegate {
public:
@@ -100,6 +100,7 @@ class ExistingUserController : public WmMessageListener::Observer,
}
virtual bool CloseOnEscape() { return true; }
virtual bool FadeInOnShow() { return false; }
+ virtual void OnHelpLinkActivated();
// CaptchaView::Delegate:
virtual void OnCaptchaEntered(const std::string& captcha);
@@ -141,6 +142,10 @@ class ExistingUserController : public WmMessageListener::Observer,
// Index of selected view (user).
size_t selected_view_index_;
+ // Number of login attempts. Used to show help link when > 1 unsuccessful
+ // logins for the same user.
+ size_t num_login_attempts_;
+
// See comment in ProcessWmMessage.
base::OneShotTimer<ExistingUserController> delete_timer_;
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698