Change the SearchBox API from using the start/end margins of the location bar to using the start ma…

chrome/browser/instant/instant_controller.h

 // Copyright 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_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 81 matching lines @@
               bool escape_pressed,
               bool is_keyword_search);
 
   // Releases and returns the NTP WebContents. May be NULL. Loads a new
   // WebContents for the NTP.
   scoped_ptr<content::WebContents> ReleaseNTPContents() WARN_UNUSED_RESULT;
 
   // Sets the bounds of the omnibox popup, in screen coordinates.
   void SetPopupBounds(const gfx::Rect& bounds);
 
-  // Sets the start and end margins of the omnibox text area.
-  void SetMarginSize(int start, int end);
+  // Sets the stored start-edge margin and width of the omnibox.
+  void SetStartMarginAndWidth(int margin, int width);
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
       const std::vector<AutocompleteProvider*>& providers);
 
   // Called when the user presses up or down. |count| is a repeat count,
   // negative for moving up, positive for moving down. Returns true if Instant
   // handled the key press.
   bool OnUpOrDownKeyPressed(int count);
 
@@ skipping 234 matching lines @@
 
   // The search model mode for the active tab.
   chrome::search::Mode search_mode_;
 
   // 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_;
-
-  // Size of the end-edge omnibox text area margin.
-  int end_margin_;
+  // The start-edge margin and width of the omnibox, used by the page align its

[sreeram, 2013/02/20 15:40:10]

page align -> page to align

[melevin, 2013/02/20 20:11:45]

Done.

+  // suggestions with the omnibox.
+  int omnibox_start_margin_;
+  int omnibox_width_;
 
   // Timer used to update the bounds of the omnibox popup.
   base::OneShotTimer<InstantController> update_bounds_timer_;
 
   // For each key K => value N, the map says that we found that the search
   // engine identified by Instant URL K didn't support the Instant API, or
   // caused RenderView crashes in each of the last N times that we loaded it.
   // If an Instant URL isn't present in the map at all or has a value 0,
   // it means that search engine supports the Instant API (or we assume it does,
   // since we haven't determined it doesn't) and it did not cause a crash.
@@ skipping 15 matching lines @@
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_preview_to_show_search_suggestions_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64, std::string> > debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_