remove oauth from 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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
@@ skipping 419 matching lines @@
   // |      separator            |
   // +--------------------+------+
   // | permissions_header |      |
   // +--------------------+------+
   // | permission1        |      |
   // +--------------------+------+
   // | permission2        |      |
   // +--------------------+------+
   //
   // Regular install
-  // w/ permissions XOR oauth issues    no permissions
+  // w/ permissions                     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             |
-  // +---------------------------+
-  //
   // If the ExtensionPermissionDialog is on, the layout is modified depending
   // on the experiment group. For text only experiment, a footer is added at the
   // bottom of the layouts. For others, inline details are added below some of
   // the permissions.
   //
   // Regular install w/ permissions and footer (experiment):
   // +--------------------+------+
   // | heading            | icon |
   // +--------------------|      |
   // | permissions_header |      |
@@ skipping 28 matching lines @@
   // +--------------------|      |
   // |checkbox|permission1|      |
   // +--------------------|      |
   // |checkbox|permission2|      |
   // +--------------------+------+
   //
   // Additionally, links or informational text is added to non-client areas of
   // the dialog depending on the experiment group.
 
   int left_column_width =
-      (prompt.ShouldShowPermissions() + prompt.GetOAuthIssueCount() +
+      (prompt.ShouldShowPermissions() +
        prompt.GetRetainedFileCount()) > 0 ?
           kPermissionsLeftColumnWidth : kNoPermissionsLeftColumnWidth;
   if (is_bundle_install())
     left_column_width = kBundleLeftColumnWidth;
   if (is_external_install())
     left_column_width = kExternalInstallLeftColumnWidth;
 
   scroll_view_ = new views::ScrollView();
   scroll_view_->set_hide_horizontal_scrollbar(true);
   AddChildView(scroll_view_);
@@ skipping 172 matching lines @@
       layout->StartRow(0, column_set_id);
       views::Label* permission_label = new views::Label(
           l10n_util::GetStringUTF16(IDS_EXTENSION_NO_SPECIAL_PERMISSIONS));
       permission_label->SetMultiLine(true);
       permission_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       permission_label->SizeToFit(left_column_width);
       layout->AddView(permission_label);
     }
   }
 
-  if (prompt.GetOAuthIssueCount()) {
+  if (prompt.GetRetainedFileCount()) {
     // Slide in under the permissions, if there are any. If there are
-    // permissions, the OAuth prompt stretches all the way to the right of the
-    // dialog. If there are no permissions, the OAuth prompt just takes up the
-    // left column.
-    int space_for_oauth = left_column_width;
+    // either, the retained files prompt stretches all the way to the
+    // right of the dialog. If there are no permissions, the retained
+    // files prompt just takes up the left column.
+    int space_for_files = left_column_width;
     if (prompt.GetPermissionCount()) {
-      space_for_oauth += kIconSize;
-      views::ColumnSet* 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(gfx::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);
-
-      PermissionDetails details;
-      const IssueAdviceInfoEntry& entry = prompt.GetOAuthIssue(i);
-      for (size_t x = 0; x < entry.details.size(); ++x)
-        details.push_back(entry.details[x]);
-      ExpandableContainerView* issue_advice_view =
-          new ExpandableContainerView(
-              this, entry.description, details, space_for_oauth,
-              true, true, false);
-      layout->AddView(issue_advice_view);
-    }
-  }
-  if (prompt.GetRetainedFileCount()) {
-    // Slide in under the permissions or OAuth, if there are any. If there are
-    // either, the retained files prompt stretches all the way to the right of
-    // the dialog. If there are no permissions or OAuth, the retained files
-    // prompt just takes up the left column.
-    int space_for_files = left_column_width;
-    if (prompt.GetPermissionCount() || prompt.GetOAuthIssueCount()) {
       space_for_files += kIconSize;
       views::ColumnSet* 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_files);
     }
 
@@ skipping 42 matching lines @@
       explanation->SetMultiLine(true);
       explanation->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       explanation->SizeToFit(left_column_width + kIconSize);
       layout->AddView(explanation);
     }
 
     if (prompt.experiment()->should_show_expandable_permission_list() ||
         (prompt.experiment()->show_details_link() &&
             prompt.experiment()->should_show_inline_explanations() &&
             !inline_explanations_.empty())) {
-      // Don't show the "Show details" link if there are OAuth issues or
-      // retained files. These have their own "Show details" links and having
+      // Don't show the "Show details" link if there are retained
+      // files.  These have their own "Show details" links and having
       // multiple levels of links is confusing.
-      if (prompt.GetOAuthIssueCount() + prompt.GetRetainedFileCount() == 0) {
+      if (prompt.GetRetainedFileCount() == 0) {
         int text_id =
             prompt.experiment()->should_show_expandable_permission_list() ?
             IDS_EXTENSION_PROMPT_EXPERIMENT_SHOW_PERMISSIONS :
             IDS_EXTENSION_PROMPT_EXPERIMENT_SHOW_DETAILS;
         show_details_link_ = new views::Link(
             l10n_util::GetStringUTF16(text_id));
         show_details_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
         show_details_link_->set_listener(this);
         UpdateLinkActionHistogram(LINK_SHOWN);
       } else {
@@ skipping 81 matching lines @@
       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_.ShouldShowPermissions()) {
         size_t permission_count = prompt_.GetPermissionCount();
         // Also span the permission header and each of the permission rows (all
         // have a padding row above it). This also works for the 'no special
         // permissions' case.
         icon_row_span = 3 + permission_count * 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;
       } else if (prompt_.GetRetainedFileCount()) {
         // Also span the permission header and the retained files container.
         icon_row_span = 4;
       }
       layout->AddView(icon, 1, icon_row_span);
     }
   }
   return layout;
 }
 
@@ skipping 400 matching lines @@
   if (slide_animation_.IsShowing())
     slide_animation_.Hide();
   else
     slide_animation_.Show();
 }
 
 void ExpandableContainerView::ExpandWithoutAnimation() {
   expanded_ = true;
   details_view_->AnimateToState(1.0);
 }