[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/autofill/autofill_popup_view_helper.h

Index: chrome/browser/ui/autofill/autofill_popup_view_helper.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_view_helper.h b/chrome/browser/ui/autofill/autofill_popup_view_helper.h
new file mode 100644
index 0000000000000000000000000000000000000000..d09e19a6f6d284c5d54d7c1db4e8080e8755ee27
--- /dev/null
+++ b/chrome/browser/ui/autofill/autofill_popup_view_helper.h
@@ -0,0 +1,88 @@
+// Copyright (c) 2016 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_HELPER_H_
+#define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_VIEW_HELPER_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 Display;
+class Point;
+}
+
+namespace ui {
+class KeyEvent;
+}
+
+namespace autofill {
+
+// Helper class which keeps tracks of popup bounds and related view information.
+class AutofillPopupViewHelper {
+ public:
+  explicit AutofillPopupViewHelper(AutofillPopupViewDelegate* delegate);
+
+#if !defined(OS_ANDROID)
+  // Calculates the desired height of the popup based on its contents.
+  int GetDesiredPopupHeight() const;
+
+  // 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_; }
+
+  // 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;
+
+ 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_;

[Evan Stade, 2016/01/13 04:30:27]

utils is usually used as a name for namespaces, not classes. Why is this a
different class and not just part of this one?

[Mathieu, 2016/01/13 17:04:27]

It is used in password_generation_controller_impl, which doesn't depend on
AutofillPopupViewHelper. They would probably also benefit from refactoring. I
will bring it up with them.

In the meantime I've renamed this to PopupViewCommon and brought it back to the
autofill namespace.

+
+  AutofillPopupViewDelegate* delegate_;  // Weak reference.
+
+  DISALLOW_COPY_AND_ASSIGN(AutofillPopupViewHelper);
+};
+
+}  // namespace autofill
+
+#endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_VIEW_HELPER_H_