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

chrome/renderer/searchbox/searchbox.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_RENDERER_SEARCHBOX_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 36 matching lines @@
   bool verbatim() const { return verbatim_; }
   size_t selection_start() const { return selection_start_; }
   size_t selection_end() const { return selection_end_; }
   int results_base() const { return results_base_; }
   const chrome::search::Mode& mode() const { return mode_; }
   bool is_key_capture_enabled() const { return is_key_capture_enabled_; }
   bool display_instant_results() const { return display_instant_results_; }
   const string16& omnibox_font() const { return omnibox_font_; }
   size_t omnibox_font_size() const { return omnibox_font_size_; }
 
-  // These functions return the start/end margins of the page text area,
-  // adjusted for the page zoom.
+  // In extended Instant, returns the start-edge margin of the location bar in
+  // screen pixels.
   int GetStartMargin() const;
-  int GetEndMargin() const;
+
+  // In extended Instant, returns the width of the location bar. Otherwise,
+  // returns the popup width.
+  int GetWidth() const;
 
   // Returns the bounds of the omnibox popup in screen coordinates.
   gfx::Rect GetPopupBounds() const;
 
   const std::vector<InstantAutocompleteResult>& GetAutocompleteResults();
   // Searchbox retains ownership of this object.
   const InstantAutocompleteResult*
       GetAutocompleteResultWithId(size_t restricted_id) const;
   const ThemeBackgroundInfo& GetThemeBackgroundInfo();
   int GetThemeAreaHeight();
 
  private:
   // Overridden from content::RenderViewObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
 
   void OnChange(const string16& query,
                 bool verbatim,
                 size_t selection_start,
                 size_t selection_end);
   void OnSubmit(const string16& query);
   void OnCancel(const string16& query);
   void OnPopupResize(const gfx::Rect& bounds);
-  void OnMarginChange(int start, int end);
+  void OnMarginChange(int margin, int width);
   void OnDetermineIfPageSupportsInstant();
   void OnAutocompleteResults(
       const std::vector<InstantAutocompleteResult>& results);
   void OnUpOrDownKeyPressed(int count);
   void OnKeyCaptureChange(bool is_key_capture_enabled);
   void OnModeChanged(const chrome::search::Mode& mode);
   void OnSetDisplayInstantResults(bool display_instant_results);
   void OnThemeChanged(const ThemeBackgroundInfo& theme_info);
   void OnThemeAreaHeightChanged(int height);
   void OnFontInformationReceived(const string16& omnibox_font,
                                  size_t omnibox_font_size);
 
   // Returns the current zoom factor of the render view or 1 on failure.
   double GetZoom() const;
 
   // Sets the searchbox values to their initial value.
   void Reset();
 
   string16 query_;
   bool verbatim_;
   size_t selection_start_;
   size_t selection_end_;
   size_t results_base_;
   int start_margin_;
-  int end_margin_;
+  int width_;

[sreeram, 2013/02/14 18:26:57]

Why do we need this? It's the same as the popup_bounds_.width.

[melevin, 2013/02/19 22:00:49]

Yeah I suppose we can reuse that.

   gfx::Rect popup_bounds_;
   std::vector<InstantAutocompleteResult> autocomplete_results_;
   size_t last_results_base_;
   std::vector<InstantAutocompleteResult> last_autocomplete_results_;
   bool is_key_capture_enabled_;
   chrome::search::Mode mode_;
   ThemeBackgroundInfo theme_info_;
   int theme_area_height_;
   bool display_instant_results_;
   string16 omnibox_font_;
   size_t omnibox_font_size_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_