Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 11 insertions, 0 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view.h b/chrome/browser/autocomplete/autocomplete_popup_view.h
index 5674e4b..279d63d 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view.h
@@ -10,6 +10,7 @@
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_
+#pragma once
 
 #include "build/build_config.h"
 
@@ -29,6 +30,13 @@ class AutocompletePopupView {
   // mean opening or closing the window.
   virtual void UpdatePopupAppearance() = 0;
 
+#if defined(TOOLKIT_VIEWS)
+  // Returns the target bounds for the popup. This returns the popup's current
+  // bounds when not animating, or the desired target bounds when animating.
+  // The return value is in screen coordinates.
+  virtual gfx::Rect GetTargetBounds() = 0;
+#endif
+
   // Paint any pending updates.
   virtual void PaintUpdatesNow() = 0;
 
@@ -40,6 +48,9 @@ class AutocompletePopupView {
 
   // Returns the popup's model.
   virtual AutocompletePopupModel* GetModel() = 0;
+
+  // Returns the max y coordinate of the popup in screen coordinates.
+  virtual int GetMaxYCoordinate() = 0;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_