[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/autofill/autofill_popup_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_VIEW_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_VIEW_H_
 
 #include <stddef.h>
 
+#include "base/strings/string16.h"
+#include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
+#include "chrome/browser/ui/autofill/popup_view_utils.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
-class Rect;
+class Display;
+class Point;
 }
 
 namespace ui {
 class KeyEvent;
 }
 
 namespace autofill {
 
 class AutofillPopupController;
 
 // The interface for creating and controlling a platform-dependent
 // AutofillPopupView.
 class AutofillPopupView {
  public:
+  explicit AutofillPopupView(AutofillPopupViewDelegate* delegate);
+  virtual ~AutofillPopupView() {}
+
   // The minimum amount of padding between the Autofill name and subtext,
   // in pixels.
   static const size_t kNamePadding = 15;
 
   // The amount of padding between icons in pixels.
   static const int kIconPadding = 5;
 
   // The amount of padding at the end of the popup in pixels.
   static const int kEndPadding = 3;
 
   // Height of the delete icon in pixels.
   static const int kDeleteIconHeight = 16;
 
   // Width of the delete icon in pixels.
   static const int kDeleteIconWidth = 16;
 
   // Displays the Autofill popup and fills it in with data from the controller.
   virtual void Show() = 0;
 
   // Hides the popup from view. This will cause the popup to be deleted.
   virtual void Hide() = 0;
 
   // Invalidates the given row and redraw it.
   virtual void InvalidateRow(size_t row) = 0;
 
   // Refreshes the position of the popup.
   virtual void UpdateBoundsAndRedrawPopup() = 0;
 
+#if !defined(OS_ANDROID)
+  // Calculates the desired height of the popup based on its contents.
+  int GetDesiredPopupHeight() const;

[Evan Stade, 2016/01/09 00:19:02]

This design uses multiple inheritance, which is not permitted in Chrome.
(AutofillPopupViewViews extends both AutofillPopupView and
AutofillPopupBaseView, both of which contain implementation as opposed to being
pure interfaces.) You can move all this to a separate class and use composition
instead.

That said, the composition solution is still not great because it leaves us with
a super ad-hoc looking UI. Ideally, we'd reuse menus, so this would look more
like native menus (e.g. bookmark folder dropdown, context menu, etc.), and
luckily, there are already cross-platform menu models and platform-specific menu
view implementations. On my system, the spacing, the font colors, font sizing,
the highlight color, and other minor details like that are all different between
the autofill dropdown and a normal menu, and I don't think there's any good
reason for that, because it's all close enough that it seems like Autofill is
mimicking menus, poorly. It's a large part of why the Autofill popup looks janky
and old.

Granted, the existing menu code may not already do everything you want it to, so
it might need to be extended. I'm unsure how much work that would be. However, I
think the final result would be fewer lines of code and better visual alignment
with the rest of the platform.

[Mathieu, 2016/01/09 00:53:17]

In your mind, would AutofillPopupViewViews extend AutofillPopupBaseView and have
a member of class say AutofillPopupViewImpl, which would contain all bounds
related code which I've added here? 

RE menus: I found SimpleMenuModel which is used for rAc, amongst many others 
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...,
it does look like an applicable thing indeed. Is it supported on all platforms
including Mac and Android? It looks like longer term work, and I'm not sure it
should block this change, since the goal is really to get views-related stuff
out of the PopupController and starting to make a better boundary. Let me know
what you think.

+
+  // Calculates the desired width of the popup based on its contents.
+  int GetDesiredPopupWidth() const;
+
+  // Calculate the width of the row, excluding all the text. This provides
+  // the size of the row that won't be reducible (since all the text can be
+  // elided if there isn't enough space). |with_label| indicates whether a label
+  // is expected to be present.
+  int RowWidthWithoutText(int row, bool with_label) const;
+
+  // Get the available space for the total text width. |with_label| indicates
+  // whether a label is expected to be present.
+  int GetAvailableWidthForRow(int row, bool with_label) const;
+
+  // Calculates and sets the bounds of the popup, including placing it properly
+  // to prevent it from going off the screen.
+  void UpdatePopupBounds();
+#endif
+
+  // Convert a y-coordinate to the closest line.
+  int LineFromY(int y);
+
+  const gfx::Rect popup_bounds() { return popup_bounds_; }
+
   // Factory function for creating the view.
   static AutofillPopupView* Create(AutofillPopupController* controller);
 
  protected:
-  virtual ~AutofillPopupView() {}
+  // Returns the bounds of the item at |index| in the popup, relative to
+  // the top left of the popup.
+  gfx::Rect GetRowBounds(size_t index);
+
+  // Returns the bounds that the popup should be placed at, given the desired
+  // width and height. By default this places the popup below |element_bounds|
+  // but it will be placed above if there isn't enough space.
+  gfx::Rect GetPopupBounds(int desired_width, int desired_height) const;
+
+  // Gets the resource value for the given resource, returning -1 if the
+  // resource isn't recognized.
+  int GetIconResourceID(const base::string16& resource_name) const;
+
+  AutofillPopupViewDelegate* delegate_;  // Weak reference.
+
+ private:
+  // Returns the enclosing rectangle for the element_bounds.
+  const gfx::Rect RoundedElementBounds() const;
+
+  // The bounds of the Autofill popup.
+  gfx::Rect popup_bounds_;
+
+  autofill::view_utils::PopupViewUtils view_utils_;
+
+  DISALLOW_COPY_AND_ASSIGN(AutofillPopupView);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_VIEW_H_