requestAutocomplete - more elaborate suggestion labels

chrome/browser/ui/views/autofill/autofill_dialog_views.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/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/wallet/wallet_service_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 164 matching lines @@
   ui::MouseEvent event_copy = event;
   event_copy.set_location(gfx::Point());
   return event_copy;
 }
 
 // AutofilDialogViews::SuggestionView ------------------------------------------
 
 AutofillDialogViews::SuggestionView::SuggestionView(
     const string16& edit_label,
     views::LinkListener* edit_listener)
-    : label_(new views::Label()) {
+    : label_(new views::Label()),
+      icon_(new views::ImageView()),
+      label_container_(new views::View()) {
+  // Label and icon.
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  AddChildView(label_);
+  label_container_->SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
+  label_container_->AddChildView(icon_);
+  label_container_->AddChildView(label_);
+  AddChildView(label_container_);
 
   // TODO(estade): The link needs to have a different color when hovered.
   views::Link* edit_link = new views::Link(edit_label);
   edit_link->set_listener(edit_listener);
   edit_link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   edit_link->SetUnderline(false);
 
   // This container prevents the edit link from being horizontally stretched.
   views::View* link_container = new views::View();
   link_container->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
   link_container->AddChildView(edit_link);
   AddChildView(link_container);
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 }
 
 AutofillDialogViews::SuggestionView::~SuggestionView() {}
 
 void AutofillDialogViews::SuggestionView::SetSuggestionText(
     const string16& text) {
   label_->SetText(text);
 }
 
+void AutofillDialogViews::SuggestionView::SetSuggestionIcon(
+    const gfx::Image& image) {
+  icon_->SetImage(image.AsImageSkia());
+}
+
 // AutofillDialogView ----------------------------------------------------------
 
 // static
 AutofillDialogView* AutofillDialogView::Create(
     AutofillDialogController* controller) {
   return new AutofillDialogViews(controller);
 }
 
 // AutofillDialogViews ---------------------------------------------------------
 
@@ skipping 463 matching lines @@
 
   return view;
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   string16 suggestion_text =
       controller_->SuggestionTextForSection(group.section);
   bool show_suggestions = !suggestion_text.empty();
   group.suggested_info->SetVisible(show_suggestions);
   group.suggested_info->SetSuggestionText(suggestion_text);
+  gfx::Image icon = controller_->SuggestionIconForSection(group.section);
+  group.suggested_info->SetSuggestionIcon(icon);
 
   if (group.section == SECTION_SHIPPING) {
     bool show_checkbox = !show_suggestions;
     // When the checkbox is going from hidden to visible, it's because the
     // user clicked "Enter new address". Reset the checkbox to unchecked in this
     // case.
     if (show_checkbox && !use_billing_for_shipping_->visible())
       use_billing_for_shipping_->SetChecked(false);
 
     use_billing_for_shipping_->SetVisible(show_checkbox);
@@ skipping 89 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill