Revert "Re-styled the App Info Dialog according to UI feedback"

chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
deleted file mode 100644
index 0491cc680f73b31eb01b437b0fca656c09349ebc..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2014 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 "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h"
-
-#include <vector>
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/launch_util.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/common/chrome_switches.h"
-#include "extensions/browser/extension_prefs.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/common/extension.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/combobox_model.h"
-#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/combobox/combobox.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
-#include "ui/views/view.h"
-
-// A model for a combobox selecting the launch options for a hosted app.
-// Displays different options depending on the host OS.
-class LaunchOptionsComboboxModel : public ui::ComboboxModel {
- public:
-  LaunchOptionsComboboxModel();
-  virtual ~LaunchOptionsComboboxModel();
-
-  extensions::LaunchType GetLaunchTypeAtIndex(int index) const;
-  int GetIndexForLaunchType(extensions::LaunchType launch_type) const;
-
-  // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
-
- private:
-  // A list of the launch types available in the combobox, in order.
-  std::vector<extensions::LaunchType> launch_types_;
-
-  // A list of the messages to display in the combobox, in order. The indexes in
-  // this list correspond to the indexes in launch_types_.
-  std::vector<base::string16> launch_type_messages_;
-};
-
-LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableStreamlinedHostedApps)) {
-    // Streamlined hosted apps can only toggle between LAUNCH_TYPE_WINDOW and
-    // LAUNCH_TYPE_REGULAR.
-    // TODO(sashab): Use a checkbox for this choice instead of combobox.
-    launch_types_.push_back(extensions::LAUNCH_TYPE_REGULAR);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_TAB));
-
-    // Although LAUNCH_TYPE_WINDOW doesn't work on Mac, the streamlined hosted
-    // apps flag isn't available on Mac, so we must be on a non-Mac OS.
-    launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
-  } else {
-    launch_types_.push_back(extensions::LAUNCH_TYPE_REGULAR);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_REGULAR));
-
-    launch_types_.push_back(extensions::LAUNCH_TYPE_PINNED);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
-
-#if defined(OS_MACOSX)
-    // Mac does not support standalone web app browser windows or maximize.
-    launch_types_.push_back(extensions::LAUNCH_TYPE_FULLSCREEN);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));
-#else
-    launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
-
-    // Even though the launch type is Full Screen, it is more accurately
-    // described as Maximized in non-Mac OSs.
-    launch_types_.push_back(extensions::LAUNCH_TYPE_FULLSCREEN);
-    launch_type_messages_.push_back(
-        l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED));
-#endif
-  }
-}
-
-LaunchOptionsComboboxModel::~LaunchOptionsComboboxModel() {
-}
-
-extensions::LaunchType LaunchOptionsComboboxModel::GetLaunchTypeAtIndex(
-    int index) const {
-  return launch_types_[index];
-}
-
-int LaunchOptionsComboboxModel::GetIndexForLaunchType(
-    extensions::LaunchType launch_type) const {
-  for (size_t i = 0; i < launch_types_.size(); i++) {
-    if (launch_types_[i] == launch_type) {
-      return i;
-    }
-  }
-  // If the requested launch type is not available, just select the first one.
-  LOG(WARNING) << "Unavailable launch type " << launch_type << " selected.";
-  return 0;
-}
-
-int LaunchOptionsComboboxModel::GetItemCount() const {
-  return launch_types_.size();
-}
-
-base::string16 LaunchOptionsComboboxModel::GetItemAt(int index) {
-  return launch_type_messages_[index];
-}
-
-AppInfoSummaryPanel::AppInfoSummaryPanel(gfx::NativeWindow parent_window,
-                                         Profile* profile,
-                                         const extensions::Extension* app,
-                                         const base::Closure& close_callback)
-    : AppInfoPanel(parent_window, profile, app, close_callback),
-      description_heading_(NULL),
-      description_label_(NULL),
-      launch_options_combobox_(NULL) {
-  // Create UI elements.
-  CreateDescriptionControl();
-  CreateLaunchOptionControl();
-  CreateShortcutsButton();
-
-  // Layout elements.
-  SetLayoutManager(
-      new views::BoxLayout(views::BoxLayout::kVertical,
-                           0,
-                           0,
-                           views::kUnrelatedControlVerticalSpacing));
-
-  LayoutDescriptionControl();
-
-  if (launch_options_combobox_)
-    AddChildView(launch_options_combobox_);
-
-  LayoutShortcutsButton();
-}
-
-AppInfoSummaryPanel::~AppInfoSummaryPanel() {
-  // Destroy view children before their models.
-  RemoveAllChildViews(true);
-}
-
-void AppInfoSummaryPanel::CreateDescriptionControl() {
-  if (!app_->description().empty()) {
-    const size_t kMaxLength = 400;
-
-    base::string16 text = base::UTF8ToUTF16(app_->description());
-    if (text.length() > kMaxLength) {
-      text = text.substr(0, kMaxLength);
-      text += base::ASCIIToUTF16(" ... ");
-    }
-
-    description_heading_ = CreateHeading(
-        l10n_util::GetStringUTF16(IDS_APPLICATION_INFO_DESCRIPTION_TITLE));
-
-    description_label_ = new views::Label(text);
-    description_label_->SetMultiLine(true);
-    description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  }
-}
-
-void AppInfoSummaryPanel::CreateLaunchOptionControl() {
-  if (CanSetLaunchType()) {
-    launch_options_combobox_model_.reset(new LaunchOptionsComboboxModel());
-    launch_options_combobox_ =
-        new views::Combobox(launch_options_combobox_model_.get());
-
-    launch_options_combobox_->set_listener(this);
-    launch_options_combobox_->SetSelectedIndex(
-        launch_options_combobox_model_->GetIndexForLaunchType(GetLaunchType()));
-  }
-}
-
-void AppInfoSummaryPanel::CreateShortcutsButton() {
-  if (CanCreateShortcuts()) {
-    create_shortcuts_button_ = new views::LabelButton(
-        this,
-        l10n_util::GetStringUTF16(
-            IDS_APPLICATION_INFO_CREATE_SHORTCUTS_BUTTON_TEXT));
-    create_shortcuts_button_->SetStyle(views::Button::STYLE_BUTTON);
-  }
-}
-
-void AppInfoSummaryPanel::LayoutDescriptionControl() {
-  if (description_label_) {
-    DCHECK(description_heading_);
-    views::View* vertical_stack = CreateVerticalStack();
-    vertical_stack->AddChildView(description_heading_);
-    vertical_stack->AddChildView(description_label_);
-
-    AddChildView(vertical_stack);
-  }
-}
-
-void AppInfoSummaryPanel::LayoutShortcutsButton() {
-  if (create_shortcuts_button_) {
-    // Add a sub-view so the shortcuts button is left-aligned.
-    views::View* left_aligned_button = new views::View();
-    left_aligned_button->SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
-    left_aligned_button->AddChildView(create_shortcuts_button_);
-
-    AddChildView(left_aligned_button);
-  }
-}
-
-void AppInfoSummaryPanel::OnPerformAction(views::Combobox* combobox) {
-  if (combobox == launch_options_combobox_) {
-    SetLaunchType(launch_options_combobox_model_->GetLaunchTypeAtIndex(
-        launch_options_combobox_->selected_index()));
-  } else {
-    NOTREACHED();
-  }
-}
-
-void AppInfoSummaryPanel::ButtonPressed(views::Button* sender,
-                                        const ui::Event& event) {
-  if (sender == create_shortcuts_button_) {
-    CreateShortcuts();
-  } else {
-    NOTREACHED();
-  }
-}
-
-extensions::LaunchType AppInfoSummaryPanel::GetLaunchType() const {
-  return extensions::GetLaunchType(extensions::ExtensionPrefs::Get(profile_),
-                                   app_);
-}
-
-void AppInfoSummaryPanel::SetLaunchType(
-    extensions::LaunchType launch_type) const {
-  DCHECK(CanSetLaunchType());
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  extensions::SetLaunchType(service, app_->id(), launch_type);
-}
-
-bool AppInfoSummaryPanel::CanSetLaunchType() const {
-  // V2 apps don't have a launch type.
-  return !app_->is_platform_app();
-}
-
-void AppInfoSummaryPanel::CreateShortcuts() {
-  DCHECK(CanCreateShortcuts());
-  chrome::ShowCreateChromeAppShortcutsDialog(
-      parent_window_, profile_, app_, base::Callback<void(bool)>());
-}
-
-bool AppInfoSummaryPanel::CanCreateShortcuts() const {
-// ChromeOS can pin apps to the app launcher, but can't create shortcuts.
-#if defined(OS_CHROMEOS)
-  return false;
-#else
-  return true;
-#endif
-}