add oauth2 zippies to views extension install dialog

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

 // 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.
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/point3.h"
+#include "ui/gfx/transform.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
@@ skipping 30 matching lines @@
 
 const int kRatingFontSizeDelta = -1;
 
 void AddResourceIcon(const gfx::ImageSkia* skia_image, void* data) {
   views::View* parent = static_cast<views::View*>(data);
   views::ImageView* image_view = new views::ImageView();
   image_view->SetImage(*skia_image);
   parent->AddChildView(image_view);
 }
 
-}  // namespace
+// Creates a string for displaying |message| to the user. If it has to look
+// like a entry in a bullet point list, one is added.
+string16 PrepareForDisplay(const string16& message, bool bullet_point) {
+  return bullet_point ? l10n_util::GetStringFUTF16(
+      IDS_EXTENSION_PERMISSION_LINE,
+      message) : message;
+}
 
 // Implements the extension installation dialog for TOOLKIT_VIEWS.
 class ExtensionInstallDialogView : public views::DialogDelegateView,
                                    public views::LinkListener {
  public:
   ExtensionInstallDialogView(content::PageNavigator* navigator,
                              ExtensionInstallPrompt::Delegate* delegate,
                              const ExtensionInstallPrompt::Prompt& prompt);
   virtual ~ExtensionInstallDialogView();
 
+  // Changes the size of the containing widget to match the preferred size
+  // of this dialog.
+  void SizeToContents();
+
  private:
   // views::DialogDelegateView:
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
@@ skipping 10 matching lines @@
     return prompt_.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
   }
 
   content::PageNavigator* navigator_;
   ExtensionInstallPrompt::Delegate* delegate_;
   ExtensionInstallPrompt::Prompt prompt_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstallDialogView);
 };
 
+// A view to display a single IssueAdviceInfoEntry.
+class IssueAdviceView : public views::View,
+                        public ui::AnimationDelegate {
+ public:
+  IssueAdviceView(ExtensionInstallDialogView* owner,
+                  const IssueAdviceInfoEntry& issue_advice,
+                  int horizontal_space);
+  virtual ~IssueAdviceView() {}
+
+  // Implementation of views::View:
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
+  virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;

[Peter Kasting, 2012/07/27 03:38:03]

Nit: I think our normal practice here is to treat OVERRIDE like "const" and say
it should be on the same line as the last arg -- so we normally would put the
three args on separate lines.

[Evan Stade, 2012/07/28 00:20:12]

function removed.

+
+  // Implementation of ui::AnimationDelegate:
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+
+ private:
+  // A view which displays all the details of an IssueAdviceInfoEntry.
+  class DetailsView : public views::View {
+   public:
+    explicit DetailsView(int horizontal_space);
+    virtual ~DetailsView() {}
+
+    // Implementation of views::View:
+    virtual gfx::Size GetPreferredSize() OVERRIDE;
+
+    void AddDetail(const string16& detail);
+
+    // Animates this to be a height proportional to |state|.
+    void AnimateToState(double state);
+
+   private:
+    views::GridLayout* layout_;
+    double state_;
+
+    DISALLOW_COPY_AND_ASSIGN(DetailsView);
+  };
+
+  // The dialog that owns |this|. It's also an ancestor in the View hierarchy.
+  ExtensionInstallDialogView* owner_;
+
+  // The data that backs |this|.
+  IssueAdviceInfoEntry issue_advice_;
+
+  // The amount of horizontal space that |this| should occupy.
+  int horizontal_space_;
+
+  // A view for showing |issue_advice_.details|.
+  DetailsView* details_view_;
+
+  // The '>' zippy control.
+  views::ImageView* arrow_view_;
+
+  views::GridLayout* layout_;
+  ui::SlideAnimation slide_animation_;
+
+  DISALLOW_COPY_AND_ASSIGN(IssueAdviceView);
+};
+
+}  // namespace
+
 ExtensionInstallDialogView::ExtensionInstallDialogView(
     content::PageNavigator* navigator,
     ExtensionInstallPrompt::Delegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt)
     : navigator_(navigator),
       delegate_(delegate),
       prompt_(prompt) {
   // Possible grid layouts:
   // Inline install
   //      w/ permissions                 no permissions
   // +--------------------+------+  +--------------+------+
   // | heading            | icon |  | heading      | icon |
   // +--------------------|      |  +--------------|      |
   // | rating             |      |  | rating       |      |
   // +--------------------|      |  +--------------+      |
   // | user_count         |      |  | user_count   |      |
   // +--------------------|      |  +--------------|      |
   // | store_link         |      |  | store_link   |      |
   // +--------------------+------+  +--------------+------+
   // |      separator            |
   // +--------------------+------+
   // | permissions_header |      |
   // +--------------------+------+
   // | permission1        |      |
   // +--------------------+------+
   // | permission2        |      |
   // +--------------------+------+
   //
   // Regular install
-  //      w/ permissions                 no permissions
+  // w/ permissions XOR oauth issues    no permissions
   // +--------------------+------+  +--------------+------+
   // | heading            | icon |  | heading      | icon |
   // +--------------------|      |  +--------------+------+
   // | permissions_header |      |
   // +--------------------|      |
   // | permission1        |      |
   // +--------------------|      |
   // | permission2        |      |
   // +--------------------+------+
+  //
+  // w/ permissions AND oauth issues
+  // +--------------------+------+
+  // | heading            | icon |
+  // +--------------------|      |
+  // | permissions_header |      |
+  // +--------------------|      |
+  // | permission1        |      |
+  // +--------------------|      |
+  // | permission2        |      |
+  // +--------------------+------+
+  // | oauth header              |
+  // +---------------------------+
+  // | oauth issue 1             |
+  // +---------------------------+
+  // | oauth issue 2             |
+  // +---------------------------+
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   int left_column_width = prompt.GetPermissionCount() > 0 ?
       kPermissionsLeftColumnWidth : kNoPermissionsLeftColumnWidth;
   if (is_bundle_install())
     left_column_width = kBundleLeftColumnWidth;
 
   column_set->AddColumn(views::GridLayout::LEADING,
                         views::GridLayout::FILL,
                         0,  // no resizing
                         views::GridLayout::USE_PREF,
-                        0,  // no fixed with
+                        0,  // no fixed width
                         left_column_width);
   if (!is_bundle_install()) {
     column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
     column_set->AddColumn(views::GridLayout::LEADING,
                           views::GridLayout::LEADING,
                           0,  // no resizing
                           views::GridLayout::USE_PREF,
                           0,  // no fixed width
                           kIconSize);
   }
@@ skipping 20 matching lines @@
     icon->SetHorizontalAlignment(views::ImageView::CENTER);
     icon->SetVerticalAlignment(views::ImageView::CENTER);
     int icon_row_span = 1;
     if (is_inline_install()) {
       // Also span the rating, user_count and store_link rows.
       icon_row_span = 4;
     } else if (prompt.GetPermissionCount()) {
       // Also span the permission header and each of the permission rows (all
       // have a padding row above it).
       icon_row_span = 3 + prompt.GetPermissionCount() * 2;
+    } else if (prompt.GetOAuthIssueCount()) {
+      // Also span the permission header and each of the permission rows (all
+      // have a padding row above it).
+      icon_row_span = 3 + prompt.GetOAuthIssueCount() * 2;
     }
     layout->AddView(icon, 1, icon_row_span);
   }
 
   if (is_inline_install()) {
     layout->StartRow(0, column_set_id);
     views::View* rating = new views::View();
     rating->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0));
     layout->AddView(rating);
@@ skipping 23 matching lines @@
 
   if (is_bundle_install()) {
     BundleInstaller::ItemList items = prompt_.bundle()->GetItemsWithState(
         BundleInstaller::Item::STATE_PENDING);
     for (size_t i = 0; i < items.size(); ++i) {
       string16 extension_name = UTF8ToUTF16(items[i].localized_name);
       base::i18n::AdjustStringForLocaleDirection(&extension_name);
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, column_set_id);
       views::Label* extension_label = new views::Label(
-          l10n_util::GetStringFUTF16(
-              IDS_EXTENSION_PERMISSION_LINE, extension_name));
+          PrepareForDisplay(extension_name, true));
       extension_label->SetMultiLine(true);
       extension_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       extension_label->SizeToFit(left_column_width);
       layout->AddView(extension_label);
     }
   }
 
   if (prompt.GetPermissionCount()) {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
@@ skipping 26 matching lines @@
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, column_set_id);
       views::Label* permission_label = new views::Label(
           prompt.GetPermission(i));
       permission_label->SetMultiLine(true);
       permission_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       permission_label->SizeToFit(left_column_width);
       layout->AddView(permission_label);
     }
   }
+
+  if (prompt.GetOAuthIssueCount()) {
+    // Slide in under the permissions; stretch all the way to the right of the
+    // dialog.
+    int space_for_oauth = left_column_width;
+    if (prompt.GetPermissionCount()) {
+      space_for_oauth += kIconSize;
+      column_set = layout->AddColumnSet(++column_set_id);
+      column_set->AddColumn(views::GridLayout::FILL,
+                            views::GridLayout::FILL,
+                            1,
+                            views::GridLayout::USE_PREF,
+                            0,  // no fixed width
+                            space_for_oauth);
+    }
+
+    layout->StartRowWithPadding(0, column_set_id,
+                                0, views::kRelatedControlVerticalSpacing);
+    views::Label* oauth_header = new views::Label(prompt.GetOAuthHeading());
+    oauth_header->SetMultiLine(true);
+    oauth_header->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    oauth_header->SizeToFit(left_column_width);
+    layout->AddView(oauth_header);
+
+    for (size_t i = 0; i < prompt.GetOAuthIssueCount(); ++i) {
+      layout->StartRowWithPadding(
+          0, column_set_id,
+          0, views::kRelatedControlVerticalSpacing);
+
+      IssueAdviceView* issue_advice_view =
+          new IssueAdviceView(this, prompt.GetOAuthIssue(i), space_for_oauth);
+      layout->AddView(issue_advice_view);
+    }
+  }
 }
 
 ExtensionInstallDialogView::~ExtensionInstallDialogView() {
 }
 
+void ExtensionInstallDialogView::SizeToContents() {
+  GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
+}
+
 string16 ExtensionInstallDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
       return prompt_.GetAcceptButtonLabel();
     case ui::DIALOG_BUTTON_CANCEL:
       return prompt_.HasAbortButtonLabel() ?
           prompt_.GetAbortButtonLabel() :
           l10n_util::GetStringUTF16(IDS_CANCEL);
     default:
@@ skipping 41 matching lines @@
 
 void ShowExtensionInstallDialogImpl(
     gfx::NativeWindow parent,
     content::PageNavigator* navigator,
     ExtensionInstallPrompt::Delegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt) {
   views::Widget::CreateWindowWithParent(
       new ExtensionInstallDialogView(navigator, delegate, prompt),
       parent)->Show();
 }
+
+// IssueAdviceView::DetailsView ------------------------------------------------
+
+IssueAdviceView::DetailsView::DetailsView(int horizontal_space)
+    : layout_(new views::GridLayout(this)),
+      state_(0) {
+  SetLayoutManager(layout_);

[Evan Stade, 2012/07/27 03:06:54]

does this also need to be in ViewHierarchyChanged? I put it here since it
doesn't create any views.

[Peter Kasting, 2012/07/27 03:38:03]

It doesn't (and I'm leaning toward nuking that anyway, see previous comment).

+  views::ColumnSet* column_set = layout_->AddColumnSet(0);
+  column_set->AddColumn(views::GridLayout::LEADING,
+                        views::GridLayout::LEADING,
+                        0,
+                        views::GridLayout::FIXED,
+                        horizontal_space,
+                        0);
+}
+
+void IssueAdviceView::DetailsView::AddDetail(const string16& detail) {
+  layout_->StartRowWithPadding(0, 0,
+                               0, views::kRelatedControlSmallVerticalSpacing);

[Peter Kasting, 2012/07/27 03:38:03]

Tiny nit: Slightly unusual wrapping... normally we'd probably wrap after the
third 0.

[Evan Stade, 2012/07/28 00:20:12]

the reason I grouped like this is because the first 2 args are related to the
row, and the second 2 are related to the padding.

+  views::Label* detail_label =
+      new views::Label(PrepareForDisplay(detail, true));
+  detail_label->SetMultiLine(true);
+  detail_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  layout_->AddView(detail_label);
+}
+
+gfx::Size IssueAdviceView::DetailsView::GetPreferredSize() {
+  gfx::Size size = views::View::GetPreferredSize();
+  return gfx::Size(size.width(), size.height() * state_);
+}
+
+void IssueAdviceView::DetailsView::AnimateToState(double state) {
+  state_ = state;
+  PreferredSizeChanged();
+  SchedulePaint();
+}
+
+// IssueAdviceView -------------------------------------------------------------
+
+IssueAdviceView::IssueAdviceView(ExtensionInstallDialogView* owner,
+                                 const IssueAdviceInfoEntry& issue_advice,
+                                 int horizontal_space)
+    : owner_(owner),
+      issue_advice_(issue_advice),

[Peter Kasting, 2012/07/27 03:38:03]

Nit: If ViewHierarchyChanged() gets nuked, do you actually need this member?

[Evan Stade, 2012/07/28 00:20:12]

no

+      horizontal_space_(horizontal_space),

[Peter Kasting, 2012/07/27 03:38:03]

Nit: If ViewHierarchyChanged() gets nuked and you move the code from
DetailsView() into this class, I think you can eliminate this member as well.

[Evan Stade, 2012/07/28 00:20:12]

I like having the DetailsView code in the DetailsView class, but yea I can
remove this member regardless.

+      details_view_(NULL),
+      arrow_view_(NULL),
+      layout_(new views::GridLayout(this)),
+      slide_animation_(this) {
+}
+
+void IssueAdviceView::ViewHierarchyChanged(
+    bool is_add, View* parent, View* child) {
+  if (!is_add || child != this)
+    return;
+
+  // TODO(estade): replace this with a more appropriate image.
+  const gfx::ImageSkia& image = *ui::ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_OMNIBOX_TTS);
+
+  SetLayoutManager(layout_);
+  int column_set_id = 0;
+  views::ColumnSet* column_set = layout_->AddColumnSet(column_set_id);
+  if (!issue_advice_.details.empty()) {
+    column_set->AddColumn(views::GridLayout::LEADING,
+                          views::GridLayout::LEADING,
+                          0,
+                          views::GridLayout::FIXED,
+                          image.width(),
+                          0);
+    horizontal_space_ -= image.width();
+    details_view_ = new DetailsView(horizontal_space_);
+  }
+  column_set->AddColumn(views::GridLayout::LEADING,
+                        views::GridLayout::FILL,
+                        0,
+                        views::GridLayout::FIXED,
+                        horizontal_space_,
+                        0);
+  layout_->StartRow(0, column_set_id);
+
+  if (details_view_) {
+    arrow_view_ = new views::ImageView();
+    arrow_view_->SetImage(image);
+    arrow_view_->SetVerticalAlignment(views::ImageView::CENTER);
+    layout_->AddView(arrow_view_);
+  }
+
+  views::Label* description_label =
+      new views::Label(PrepareForDisplay(issue_advice_.description,
+                                         !details_view_));
+  description_label->SetMultiLine(true);
+  description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  description_label->SizeToFit(horizontal_space_);
+  layout_->AddView(description_label);
+
+  if (!details_view_)
+    return;
+
+  layout_->StartRow(0, column_set_id);
+  layout_->SkipColumns(1);
+  layout_->AddView(details_view_);
+
+  for (size_t i = 0; i < issue_advice_.details.size(); ++i)
+    details_view_->AddDetail(issue_advice_.details[i]);
+}
+
+bool IssueAdviceView::OnMousePressed(const views::MouseEvent& event) {
+  return details_view_ && event.IsLeftMouseButton();
+}
+
+void IssueAdviceView::OnMouseReleased(const views::MouseEvent& event) {
+  if (slide_animation_.IsShowing())
+    slide_animation_.Hide();
+  else
+    slide_animation_.Show();
+}
+
+void IssueAdviceView::AnimationProgressed(const ui::Animation* animation) {
+  DCHECK_EQ(animation, &slide_animation_);
+
+  if (details_view_)
+    details_view_->AnimateToState(animation->GetCurrentValue());
+
+  if (arrow_view_) {
+    ui::Transform rotate;
+    if (animation->GetCurrentValue() != 0.0) {
+      rotate.SetTranslate(-arrow_view_->width() / 2.0,
+                          -arrow_view_->height() / 2.0);
+      rotate.ConcatRotate(animation->GetCurrentValue() * 90);
+      rotate.ConcatTranslate(arrow_view_->width() / 2.0,
+                             arrow_view_->height() / 2.0);
+    }
+    arrow_view_->SetTransform(rotate);
+  }
+}
+
+void IssueAdviceView::ChildPreferredSizeChanged(views::View* child) {
+  owner_->SizeToContents();
+}