Revert r 144574 "Modify experimental identity flow to display scope descriptions and details."

chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.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 <gtk/gtk.h>
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
@@ skipping 64 matching lines @@
 
 ExtensionInstallDialog::ExtensionInstallDialog(
     Browser* browser,
     GtkWindow* parent,
     ExtensionInstallPrompt::Delegate *delegate,
     const ExtensionInstallPrompt::Prompt& prompt)
     : browser_(browser),
       delegate_(delegate),
       dialog_(NULL) {
   bool show_permissions = prompt.GetPermissionCount() > 0;
-  bool show_oauth_issues = prompt.GetOAuthIssueCount() > 0;
   bool is_inline_install =
       prompt.type() == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT;
   bool is_bundle_install =
       prompt.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
 
   if (is_inline_install)
     extension_id_ = prompt.extension()->id();
 
   // Build the dialog.
   dialog_ = gtk_dialog_new_with_buttons(
@@ skipping 27 matching lines @@
   GtkWidget* top_content_hbox = gtk_hbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_box_pack_start(GTK_BOX(content_vbox), top_content_hbox, TRUE, TRUE, 0);
 
   // Create a new vbox for the left column.
   GtkWidget* left_column_area = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(top_content_hbox), left_column_area,
                      TRUE, TRUE, 0);
 
   GtkWidget* heading_vbox = gtk_vbox_new(FALSE, 0);
   // If we are not going to show anything else, vertically center the title.
-  bool center_heading =
-      !show_permissions && !show_oauth_issues && !is_inline_install;
+  bool center_heading = !show_permissions && !is_inline_install;
   gtk_box_pack_start(GTK_BOX(left_column_area), heading_vbox, center_heading,
                      center_heading, 0);
 
   // Heading
   GtkWidget* heading_label = gtk_util::CreateBoldLabel(
       UTF16ToUTF8(prompt.GetHeading().c_str()));
   gtk_label_set_line_wrap(GTK_LABEL(heading_label), true);
   gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
   gtk_box_pack_start(GTK_BOX(heading_vbox), heading_label, center_heading,
                      center_heading, 0);
@@ skipping 38 matching lines @@
 
     BundleInstaller::ItemList items = prompt.bundle()->GetItemsWithState(
         BundleInstaller::Item::STATE_PENDING);
     for (size_t i = 0; i < items.size(); ++i) {
       GtkWidget* extension_label = gtk_label_new(UTF16ToUTF8(
           items[i].GetNameForDisplay()).c_str());
       gtk_util::SetLabelWidth(extension_label, kLeftColumnMinWidth);
       gtk_box_pack_start(GTK_BOX(extensions_vbox), extension_label,
                          FALSE, FALSE, kExtensionsPadding);
     }
-  } else {
+  }
+
+  if (!is_bundle_install) {
     // Resize the icon if necessary.
     SkBitmap scaled_icon = *prompt.icon().ToSkBitmap();
     if (scaled_icon.width() > kImageSize || scaled_icon.height() > kImageSize) {
       scaled_icon = skia::ImageOperations::Resize(
           scaled_icon, skia::ImageOperations::RESIZE_LANCZOS3,
           kImageSize, kImageSize);
     }
 
     // Put icon in the right column.
     GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(scaled_icon);
@@ skipping 25 matching lines @@
 
     for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) {
       GtkWidget* permission_label = gtk_label_new(UTF16ToUTF8(
           prompt.GetPermission(i)).c_str());
       gtk_util::SetLabelWidth(permission_label, kLeftColumnMinWidth);
       gtk_box_pack_start(GTK_BOX(permissions_container), permission_label,
                          FALSE, FALSE, kPermissionsPadding);
     }
   }
 
-  if (show_oauth_issues) {
-    GtkWidget* oauth_issues_container;
-    if (is_inline_install) {
-      oauth_issues_container = content_vbox;
-      gtk_box_pack_start(GTK_BOX(content_vbox), gtk_hseparator_new(),
-                         FALSE, FALSE, ui::kControlSpacing);
-    } else {
-      oauth_issues_container = left_column_area;
-    }
-
-    GtkWidget* oauth_issues_header = gtk_util::CreateBoldLabel(
-        "The app wants these scopes:");
-    gtk_util::SetLabelWidth(oauth_issues_header, kLeftColumnMinWidth);
-    gtk_box_pack_start(GTK_BOX(oauth_issues_container), oauth_issues_header,
-                       FALSE, FALSE, 0);
-
-    // TODO(estade): display the issue details under zippies.
-    for (size_t i = 0; i < prompt.GetOAuthIssueCount(); ++i) {
-      GtkWidget* label = gtk_label_new(
-          prompt.GetOAuthIssue(i).description.c_str());
-      gtk_util::SetLabelWidth(label, kLeftColumnMinWidth);
-      gtk_box_pack_start(GTK_BOX(oauth_issues_container), label,
-                         FALSE, FALSE, kPermissionsPadding);
-    }
-  }
-
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE);
 
   gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_CLOSE);
   gtk_widget_show_all(dialog_);
   gtk_widget_grab_focus(close_button);
 }
 
 ExtensionInstallDialog::~ExtensionInstallDialog() {
 }
@@ skipping 28 matching lines @@
   BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
       browser->window());
   if (!browser_window) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   new browser::ExtensionInstallDialog(browser, browser_window->window(),
                                       delegate, prompt);
 }