Removed the App Info information from the Create App Shortcuts dialog

chrome/browser/ui/views/create_application_shortcut_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 "chrome/browser/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 240 matching lines @@
 CreateApplicationShortcutView::CreateApplicationShortcutView(Profile* profile)
     : profile_(profile),
       app_info_(NULL),
       create_shortcuts_label_(NULL),
       desktop_check_box_(NULL),
       menu_check_box_(NULL),
       quick_launch_check_box_(NULL) {}
 
 CreateApplicationShortcutView::~CreateApplicationShortcutView() {}
 
-void CreateApplicationShortcutView::InitControls() {
-  // Create controls
-  app_info_ = new AppInfoView(shortcut_info_.title, shortcut_info_.description,
-                              shortcut_info_.favicon);
+void CreateApplicationShortcutView::InitControls(
+    enum DialogLayout dialog_layout) {
+  if (dialog_layout == DialogLayout::URL_SHORTCUT_LAYOUT)

[benwells, 2014/06/02 01:04:31]

Nit1: as the body of this if spans multiple lines, it needs curlies.

Nit2: You don't need the DialogLayout:: here or on the other lines you have.

[sashab, 2014/06/02 01:34:57]

Done.

[sashab, 2014/06/02 01:34:57]

Done.

+    app_info_ = new AppInfoView(shortcut_info_.title,
+                                shortcut_info_.description,
+                                shortcut_info_.favicon);
   create_shortcuts_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL));
   create_shortcuts_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   desktop_check_box_ = AddCheckbox(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_DESKTOP_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateOnDesktop));
 
   menu_check_box_ = NULL;
   quick_launch_check_box_ = NULL;
@@ skipping 26 matching lines @@
   views::ColumnSet* column_set = layout->AddColumnSet(kHeaderColumnSetId);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         100.0f, views::GridLayout::FIXED, 0, 0);
 
   static const int kTableColumnSetId = 1;
   column_set = layout->AddColumnSet(kTableColumnSetId);
   column_set->AddPaddingColumn(0, views::kPanelHorizIndentation);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         100.0f, views::GridLayout::USE_PREF, 0, 0);
 
-  layout->StartRow(0, kHeaderColumnSetId);
-  layout->AddView(app_info_);
+  if (app_info_) {
+    layout->StartRow(0, kHeaderColumnSetId);
+    layout->AddView(app_info_);
+    layout->AddPaddingRow(0, views::kPanelSubVerticalSpacing);
+  }
 
-  layout->AddPaddingRow(0, views::kPanelSubVerticalSpacing);
   layout->StartRow(0, kHeaderColumnSetId);
   layout->AddView(create_shortcuts_label_);
 
   layout->AddPaddingRow(0, views::kLabelToControlVerticalSpacing);
   layout->StartRow(0, kTableColumnSetId);
   layout->AddView(desktop_check_box_);
 
   if (menu_check_box_ != NULL) {
     layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
     layout->StartRow(0, kTableColumnSetId);
@@ skipping 108 matching lines @@
   const WebApplicationInfo& app_info =
       extensions::TabHelper::FromWebContents(web_contents_)->web_app_info();
   if (!app_info.icons.empty()) {
     web_app::GetIconsInfo(app_info, &unprocessed_icons_);
     FetchIcon();
   }
 
   // Create URL app shortcuts in the top-level menu.
   create_in_chrome_apps_subdir_ = false;
 
-  InitControls();
+  InitControls(DialogLayout::URL_SHORTCUT_LAYOUT);
 }
 
 CreateUrlApplicationShortcutView::~CreateUrlApplicationShortcutView() {
 }
 
 bool CreateUrlApplicationShortcutView::Accept() {
   if (!CreateApplicationShortcutView::Accept())
     return false;
 
   // Get the smallest icon in the icon family (should have only 1).
@@ skipping 63 matching lines @@
   }
 }
 
 CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
     Profile* profile,
     const extensions::Extension* app,
     const base::Callback<void(bool)>& close_callback)
         : CreateApplicationShortcutView(profile),
           close_callback_(close_callback),
           weak_ptr_factory_(this) {
-  // Required by InitControls().
-  shortcut_info_.title = base::UTF8ToUTF16(app->name());
-  shortcut_info_.description = base::UTF8ToUTF16(app->description());
-
   // Place Chrome app shortcuts in the "Chrome Apps" submenu.
   create_in_chrome_apps_subdir_ = true;
 
-  InitControls();
-
-  // Get shortcut information and icon now; they are needed for our UI.
-  web_app::UpdateShortcutInfoAndIconForApp(
-      app, profile,
-      base::Bind(&CreateChromeApplicationShortcutView::OnShortcutInfoLoaded,
-                 weak_ptr_factory_.GetWeakPtr()));
+  InitControls(DialogLayout::APP_SHORTCUT_LAYOUT);
 }
 
 CreateChromeApplicationShortcutView::~CreateChromeApplicationShortcutView() {}
 
 bool CreateChromeApplicationShortcutView::Accept() {
   if (!close_callback_.is_null())
     close_callback_.Run(true);
   return CreateApplicationShortcutView::Accept();
 }
 
 bool CreateChromeApplicationShortcutView::Cancel() {
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }
-
-// Called when the app's ShortcutInfo (with icon) is loaded.
-void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
-    const web_app::ShortcutInfo& shortcut_info) {
-  shortcut_info_ = shortcut_info;
-
-  CHECK(app_info_);
-  static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
-}