Upstream changes needed by Android auto-login.

chrome/browser/ui/auto_login_info_bar_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_AUTO_LOGIN_INFO_BAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_AUTO_LOGIN_INFO_BAR_DELEGATE_H_
 
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 
 class InfoBarTabHelper;
 class PrefService;
 class TokenService;
 
 namespace content {
 class NavigationController;
 }  // namespace content
 
 // This is the actual infobar displayed to prompt the user to auto-login.
 class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   AutoLoginInfoBarDelegate(InfoBarTabHelper* owner,
-                           const std::string& username,
-                           const std::string& args);
+                           const std::string& realm,
+                           const std::string& account,
+                           const std::string& args,
+                           const std::string& username);
   virtual ~AutoLoginInfoBarDelegate();
 
- private:
-  // ConfirmInfoBarDelegate overrides.
+  // InfoBarDelegate:
+  virtual AutoLoginInfoBarDelegate* AsAutoLoginInfoBarDelegate() OVERRIDE;

[Peter Kasting, 2012/06/27 17:39:05]

Nit: AutoLoginInfoBarDelegate doesn't inherit directly from this class, so don't
create a section for it.  Place this function in the appropriate place in the
list below.

[Philippe, 2012/06/28 09:24:00]

Done.

+
+  // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
+  string16 GetMessageText(const std::string& username) const;

[Peter Kasting, 2012/06/27 17:39:05]

Similar to my question about the downcast routine: you don't call any of these
new functions directly.  You need to either remove them or document precisely
why you need them and how some non-Android maintainer can know how to
refactor/modify/remove them in the future.

[Philippe, 2012/06/28 09:24:00]

We use that in the Android implementation of the auto bar on the app side. I
added a comment.

+
+  const std::string& realm() const {

[Peter Kasting, 2012/06/27 17:39:05]

Nit: All on one line (3 places)

[Philippe, 2012/06/28 09:24:00]

Done.

+    return realm_;
+  }
+

[Peter Kasting, 2012/06/27 17:39:05]

Nit: Remove blank lines between getters

[Philippe, 2012/06/28 09:24:00]

Done.

+  const std::string& account() const {
+    return account_;
+  }
+
+  const std::string& args() const {
+    return args_;
+  }
+
+ private:
   void RecordHistogramAction(int action);
 
-  // Username to display in the infobar indicating user to be logged in as.
+  // "realm" string from x-auto-login (e.g. "com.google").
+  std::string realm_;
+
+  // "account" string from x-auto-login.
+  std::string account_;
+
+  // "args" string from x-auto-login to be passed to MergeSession. This string
+  // should be considered opaque and not be cracked open to look inside.
+  std::string args_;
+
+  // Username to display in the infobar indicating user to be logged in as. This
+  // was initially fetched from sync on non-Android platforms.
   std::string username_;
 
-  // "args" string from x-auto-login to be passed to MergeSession.  This
-  // string should be considered opaque and not be cracked open to look inside.
-  std::string args_;
-
   // Whether any UI controls in the infobar were pressed or not.
   bool button_pressed_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_AUTO_LOGIN_INFO_BAR_DELEGATE_H_