Modernize autofill popup design

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/components_scaled_resources.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 using base::WeakPtr;
 
 namespace autofill {
 namespace {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 // The vertical height of each row in pixels.
 const size_t kRowHeight = 24;
+const size_t kMaterialRowHeight = 36;
+
+// The vertical height of the option row in pixel.
+const size_t kMaterialOptionRowHeight = 44;
 
 // The vertical height of a separator in pixels.
 const size_t kSeparatorHeight = 1;
 
 #if !defined(OS_ANDROID) || defined(USE_AURA)
 // Size difference between name and label in pixels.
 const int kLabelFontSizeDelta = -2;
+const int kMaterialLabelFontSizeDelta = -3;
 
 const size_t kNamePadding = AutofillPopupView::kNamePadding;
 const size_t kIconPadding = AutofillPopupView::kIconPadding;
 const size_t kEndPadding = AutofillPopupView::kEndPadding;
+const size_t kMaterialEndPadding = AutofillPopupView::kMaterialEndPadding;
 #endif
 
 struct DataResource {
   const char* name;
   int id;
 };
 
 const DataResource kDataResources[] = {
   { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
   { "dinersCC", IDR_AUTOFILL_CC_GENERIC },
@@ skipping 47 matching lines @@
                                                    container_view,
                                                    web_contents)),
       view_(NULL),
       delegate_(delegate),
       weak_ptr_factory_(this) {
   ClearState();
   controller_common_->SetKeyPressCallback(
       base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
                  base::Unretained(this)));
 #if !defined(OS_ANDROID) || defined(USE_AURA)
-  label_font_list_ = value_font_list_.DeriveWithSizeDelta(kLabelFontSizeDelta);
+  label_font_list_ = value_font_list_.DeriveWithSizeDelta(
+      ui::MaterialDesignController::IsModeMaterial()

[Evan Stade, 2015/12/14 21:37:44]

please don't reuse this flag. I'm not sure we need to develop this behind a flag
at all, but if you do want to, add a new flag (because if we decide to flip the
default value of this flag for some platform, we won't be considering whether
the Autofill popup is ready).

+          ? kMaterialLabelFontSizeDelta
+          : kLabelFontSizeDelta);
   title_font_list_ = value_font_list_.DeriveWithStyle(gfx::Font::BOLD);
 #if defined(OS_MACOSX)
   // There is no italic version of the system font.
   warning_font_list_ = value_font_list_;
 #else
   warning_font_list_ = value_font_list_.DeriveWithStyle(gfx::Font::ITALIC);
 #endif
 #endif
 }
 
@@ skipping 242 matching lines @@
 bool AutofillPopupControllerImpl::IsWarning(size_t index) const {
   return suggestions_[index].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE;
 }
 
 gfx::Rect AutofillPopupControllerImpl::GetRowBounds(size_t index) {
   int top = kPopupBorderThickness;
   for (size_t i = 0; i < index; ++i) {
     top += GetRowHeightFromId(suggestions_[i].frontend_id);
   }
 
-  return gfx::Rect(
-      kPopupBorderThickness,
-      top,
-      popup_bounds_.width() - 2 * kPopupBorderThickness,
-      GetRowHeightFromId(suggestions_[index].frontend_id));
+  return gfx::Rect(kPopupBorderThickness, top,
+                   popup_bounds_.width() - 2 * kPopupBorderThickness,
+                   GetRowHeightFromId(suggestions_[index].frontend_id));
 }
 
 void AutofillPopupControllerImpl::SetPopupBounds(const gfx::Rect& bounds) {
   popup_bounds_ = bounds;
   UpdateBoundsAndRedrawPopup();
 }
 
 const gfx::Rect& AutofillPopupControllerImpl::popup_bounds() const {
   return popup_bounds_;
 }
@@ skipping 161 matching lines @@
   }
 
   // The y value goes beyond the popup so stop the selection at the last line.
   return GetLineCount() - 1;
 }
 
 int AutofillPopupControllerImpl::GetRowHeightFromId(int identifier) const {
   if (identifier == POPUP_ITEM_ID_SEPARATOR)
     return kSeparatorHeight;
 
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    if (identifier == POPUP_ITEM_ID_AUTOFILL_OPTIONS)

[Evan Stade, 2015/12/14 21:37:44]

ternary operator

+      return kMaterialOptionRowHeight;
+    else
+      return kMaterialRowHeight;
+  }
+
   return kRowHeight;
 }
 
 bool AutofillPopupControllerImpl::CanAccept(int id) {
   return id != POPUP_ITEM_ID_SEPARATOR && id != POPUP_ITEM_ID_WARNING_MESSAGE &&
          id != POPUP_ITEM_ID_TITLE;
 }
 
 bool AutofillPopupControllerImpl::HasSuggestions() {
   if (suggestions_.empty())
@@ skipping 46 matching lines @@
   int popup_height = 2 * kPopupBorderThickness;
 
   for (size_t i = 0; i < suggestions_.size(); ++i) {
     popup_height += GetRowHeightFromId(suggestions_[i].frontend_id);
   }
 
   return popup_height;
 }
 
 int AutofillPopupControllerImpl::RowWidthWithoutText(int row) const {
-  int row_size = kEndPadding;
+  int row_size = ui::MaterialDesignController::IsModeMaterial()
+                     ? kMaterialEndPadding
+                     : kEndPadding;
 
   if (!elided_labels_[row].empty())
     row_size += kNamePadding;
 
   // Add the Autofill icon size, if required.
   const base::string16& icon = suggestions_[row].icon;
   if (!icon.empty()) {
     int icon_width = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         GetIconResourceID(icon)).Width();
     row_size += icon_width + kIconPadding;
   }
 
   // Add the padding at the end.
-  row_size += kEndPadding;
+  row_size += ui::MaterialDesignController::IsModeMaterial()
+                  ? kMaterialEndPadding
+                  : kEndPadding;
 
   // Add room for the popup border.
   row_size += 2 * kPopupBorderThickness;
 
   return row_size;
 }
 
 void AutofillPopupControllerImpl::UpdatePopupBounds() {
   int popup_width = GetDesiredPopupWidth();
   int popup_height = GetDesiredPopupHeight();
@@ skipping 13 matching lines @@
   popup_bounds_ = gfx::Rect();
 
   suggestions_.clear();
   elided_values_.clear();
   elided_labels_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill