Win: Display a native bubble (instead of the JS one) after the web signin flow.

chrome/browser/ui/views/sync/one_click_signin_bubble_view.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_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
@@ skipping 13 matching lines @@
 class OneClickSigninBubbleView : public views::BubbleDelegateView,
                                  public views::LinkListener,
                                  public views::ButtonListener {
  public:
   // Show the one-click signin bubble if not already showing.  The bubble
   // will be placed visually beneath |anchor_view|.  |start_sync| is called
   // to start sync.
   static void ShowBubble(BrowserWindow::OneClickSigninBubbleType type,
                          const string16& email,
                          ToolbarView* toolbar_view,
-                         const BrowserWindow::StartSyncCallback& start_sync);
+                         const BrowserWindow::StartSyncCallback& start_sync,
+                         const std::string& error_message);
 
   static bool IsShowing();
 
   static void Hide();
 
   // Gets the global bubble view.  If its not showing returns NULL.  This
   // method is meant to be called only from tests.
   static OneClickSigninBubbleView* view_for_testing() { return bubble_view_; }
 
  protected:
   // Creates a OneClickSigninBubbleView.
   OneClickSigninBubbleView(
+      content::WebContents* web_content,
       views::View* anchor_view,
-      const BrowserWindow::StartSyncCallback& start_sync_callback);
+      const std::string& error_message);
 
   virtual ~OneClickSigninBubbleView();
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
+  // views::View method:
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+
+  // Creates learn more link to be used at the bottom of the bubble.
+  // Derived classes can reimplement.  The caller of this function owns the
+  // returned link.
+  virtual views::Link* GetLearnMoreLink();
+
+  // Creates advanced link to be used at the bottom of the bubble.
+  // Derived classes can reimplement.  The caller of this function owns the
+  // returned link.
+  virtual views::Link* GetAdvancedLink();

[Roger Tawa OOO till Jul 10th, 2013/04/17 17:53:25]

The GetXXXLink() methods should probably moved below all the base class
overrides.  Why are these methods protected?

[noms (inactive), 2013/04/17 20:32:37]

Moved all of them to private as I killed the silly inheritance structure.

On 2013/04/17 17:53:25, Roger Tawa wrote:

+
+  // views::WidgetDelegate method:
+  virtual void WindowClosing() OVERRIDE;
+
+  // Link to sync setup advanced page.
+  views::Link* advanced_link_;
+
+  // Link to the Learn More details page
+  views::Link* learn_more_link_;
+
+  // Controls at bottom of bubble.
+  views::LabelButton* ok_button_;
+  views::LabelButton* undo_button_;
+
+  content::WebContents* web_content_;

[Roger Tawa OOO till Jul 10th, 2013/04/17 17:53:25]

Member variables should always be private.  Might be better to name
web_contents_ ?

[noms (inactive), 2013/04/17 20:32:37]

Done.

+
  private:
   friend class OneClickSigninBubbleViewBrowserTest;
 
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewBrowserTest, OkButton);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewBrowserTest, UndoButton);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninBubbleViewBrowserTest, AdvancedLink);
-
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, BubbleOkButton);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, DialogOkButton);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, DialogUndoButton);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, BubbleAdvancedLink);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, DialogAdvancedLink);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, BubbleLearnMoreLink);
+  FRIEND_TEST_ALL_PREFIXES(
+    OneClickSigninBubbleViewBrowserTest, DialogLearnMoreLink);
   // views::BubbleDelegateView methods:
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
   virtual void Init() OVERRIDE;
 
   // Method to build the main part of the bubble.  Derived classes should
   // reimplement this function.
   virtual void InitContent(views::GridLayout* layout);
+  virtual void InitButtons(views::GridLayout* layout);
 
-  // Creates OK and Undo buttons to be used at the bottom of the bubble.
+  // Creates OK/Undo button to be used at the bottom of the bubble.
+  // By default, the Undo button is initialized, but not displayed
   // Derived classes can reimplement to have buttons with different labels,
   // colours, or sizes.  The caller of this function owns the returned buttons.
   virtual void GetButtons(views::LabelButton** ok_button,
                           views::LabelButton** undo_button);
 
-  // Creates advanced link to be used at the bottom of the bubble.
-  // Derived classes can reimplement.  The caller of this function owns the
-  // returned link.
-  virtual views::Link* GetAdvancedLink();
-
-  // views::WidgetDelegate method:
-  virtual void WindowClosing() OVERRIDE;
-
-  // views::View method:
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-
   // The bubble, if we're showing one.
   static OneClickSigninBubbleView* bubble_view_;
 
-  // Link to sync setup advanced page.
-  views::Link* advanced_link_;
-
-  // Controls at bottom of bubble.
-  views::LabelButton* ok_button_;
-  views::LabelButton* undo_button_;
-
-  // This callback is nulled once its called, so that it is called only once.
-  // It will be called when the bubble is closed if it has not been called
-  // and nulled earlier.
-  BrowserWindow::StartSyncCallback start_sync_callback_;
-
   // A message loop used only with unit tests.
   base::MessageLoop* message_loop_for_testing_;
 
+  // Alternate error message to be displayed
+  std::string error_message_;
+
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_