Chromium Code Reviews| Index: chrome/browser/instant/instant_controller.h |
| diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h |
| index 34e78ab1e86101103bbee3e637b643aefa4cef20..a58b8f457ddefac85771cc95f265a59110b1c622 100644 |
| --- a/chrome/browser/instant/instant_controller.h |
| +++ b/chrome/browser/instant/instant_controller.h |
| @@ -62,8 +62,11 @@ class InstantController { |
| bool user_input_in_progress, |
| bool omnibox_popup_is_open); |
| - // Sets the bounds of the omnibox dropdown, in screen coordinates. |
| - void SetOmniboxBounds(const gfx::Rect& bounds); |
| + // Sets the bounds of the omnibox popup, in screen coordinates. |
| + void SetPopupBounds(const gfx::Rect& bounds); |
| + |
| + // Sets the widths of the start and end margins of the Instant page. |
|
samarth
2012/12/07 01:44:49
nit: this isn't quite right. Something like "Sets
melevin
2012/12/08 00:04:09
Done.
|
| + void SetMarginSize(int start, int end); |
| // Send autocomplete results from |providers| to the preview page. |
| void HandleAutocompleteResults( |
| @@ -186,8 +189,8 @@ class InstantController { |
| int height, |
| InstantSizeUnits units); |
| - // Send the omnibox dropdown bounds to the page. |
| - void SendBoundsToPage(); |
| + // Send the omnibox popup bounds to the page. |
| + void SendPopupBoundsToPage(); |
| // If |template_url| is a valid TemplateURL for use with Instant, fills in |
| // |instant_url| and returns true; returns false otherwise. |
| @@ -243,13 +246,19 @@ class InstantController { |
| // The search model mode for the active tab. |
| chrome::search::Mode search_mode_; |
| - // Current omnibox bounds. |
| - gfx::Rect omnibox_bounds_; |
| + // Current omnibox popup bounds. |
| + gfx::Rect popup_bounds_; |
| + |
| + // Last popup bounds passed to the page. |
| + gfx::Rect last_popup_bounds_; |
| + |
| + // Size of the start-edge omnibox text area margin. |
| + int start_margin_; |
| - // Last bounds passed to the page. |
| - gfx::Rect last_omnibox_bounds_; |
| + // Size of the end-edge omnibox text area margin. |
| + int end_margin_; |
| - // Timer used to update the bounds of the omnibox. |
| + // Timer used to update the bounds of the omnibox popup. |
| base::OneShotTimer<InstantController> update_bounds_timer_; |
| // Timer used to ensure that the Instant page does not get too stale. |