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

chrome/browser/instant/instant_controller.cc

 // 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.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 183 matching lines @@
     : browser_(browser),
       extended_enabled_(extended_enabled),
       instant_enabled_(false),
       use_local_preview_only_(true),
       model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       last_omnibox_text_has_inline_autocompletion_(false),
       last_verbatim_(false),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
       last_match_was_search_(false),
       omnibox_focus_state_(OMNIBOX_FOCUS_NONE),
-      start_margin_(0),
-      end_margin_(0),
+      omnibox_start_margin_(0),
+      omnibox_width_(0),
       allow_preview_to_show_search_suggestions_(false) {
 }
 
 InstantController::~InstantController() {
 }
 
 bool InstantController::Update(const AutocompleteMatch& match,
                                const string16& user_text,
                                const string16& full_text,
                                size_t selection_start,
@@ skipping 241 matching lines @@
   if (popup_bounds_.height() > last_popup_bounds_.height()) {
     update_bounds_timer_.Stop();
     SendPopupBoundsToPage();
   } else if (!update_bounds_timer_.IsRunning()) {
     update_bounds_timer_.Start(FROM_HERE,
         base::TimeDelta::FromMilliseconds(kUpdateBoundsDelayMS), this,
         &InstantController::SendPopupBoundsToPage);
   }
 }
 
-void InstantController::SetMarginSize(int start, int end) {
-  if (!extended_enabled_ || (start_margin_ == start && end_margin_ == end))
+void InstantController::SetStartMarginAndWidth(int margin, int width) {
+  if (!extended_enabled_ ||
+      (omnibox_start_margin_ == margin && omnibox_width_ == width))
     return;
 
-  start_margin_ = start;
-  end_margin_ = end;
+  omnibox_start_margin_ = margin;
+  omnibox_width_ = width;
   if (overlay_)
-    overlay_->SetMarginSize(start_margin_, end_margin_);
+    overlay_->SetStartMarginAndWidth(omnibox_start_margin_, omnibox_width_);
   if (ntp_)
-    ntp_->SetMarginSize(start_margin_, end_margin_);
+    ntp_->SetStartMarginAndWidth(omnibox_start_margin_, omnibox_width_);
   if (instant_tab_)
-    instant_tab_->SetMarginSize(start_margin_, end_margin_);
+    instant_tab_->SetStartMarginAndWidth(margin, width);
 }
 
 void InstantController::HandleAutocompleteResults(
     const std::vector<AutocompleteProvider*>& providers) {
   if (!extended_enabled_)
     return;
 
   if (!instant_tab_ && !overlay_)
     return;
 
@@ skipping 366 matching lines @@
     return;
 
   // Update theme info so that the page picks it up.
   browser_->UpdateThemeInfo(false);
 
   // Ensure the searchbox API has the correct initial state.
   if (IsContentsFrom(overlay(), contents)) {
     overlay_->SetDisplayInstantResults(instant_enabled_);
     overlay_->KeyCaptureChanged(
         omnibox_focus_state_ == OMNIBOX_FOCUS_INVISIBLE);
-    overlay_->SetMarginSize(start_margin_, end_margin_);
+    overlay_->SetStartMarginAndWidth(omnibox_start_margin_, omnibox_width_);
     overlay_->InitializeFonts();
   } else if (IsContentsFrom(ntp(), contents)) {
     ntp_->SetDisplayInstantResults(instant_enabled_);
-    ntp_->SetMarginSize(start_margin_, end_margin_);
+    ntp_->SetStartMarginAndWidth(omnibox_start_margin_, omnibox_width_);
     ntp_->InitializeFonts();
   } else {
     NOTREACHED();
   }
 }
 
 void InstantController::InstantSupportDetermined(
     const content::WebContents* contents,
     bool supports_instant) {
   if (IsContentsFrom(instant_tab(), contents)) {
@@ skipping 287 matching lines @@
   // Do not wire up the InstantTab if instant should only use local previews, to
   // prevent it from sending data to the page.
   if (!search_mode_.is_origin_default() && !use_local_preview_only_) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->contents()) {
       instant_tab_.reset(new InstantTab(this));
       instant_tab_->Init(active_tab);
       // Update theme info for this tab.
       browser_->UpdateThemeInfo(false);
       instant_tab_->SetDisplayInstantResults(instant_enabled_);
-      instant_tab_->SetMarginSize(start_margin_, end_margin_);
+      instant_tab_->SetStartMarginAndWidth(
+          omnibox_start_margin_, omnibox_width_);
       instant_tab_->InitializeFonts();
       instant_tab_->KeyCaptureChanged(
           omnibox_focus_state_ == OMNIBOX_FOCUS_INVISIBLE);
     }
 
     // Hide the |overlay_| since we are now using |instant_tab_| instead.
     HideOverlay();
   } else {
     instant_tab_.reset();
   }
@@ skipping 216 matching lines @@
   delete overlay_->ReleaseContents().release();
   MessageLoop::current()->DeleteSoon(FROM_HERE, overlay_.release());
   EnsureOverlayIsCurrent(false);
 }
 
 void InstantController::RemoveFromBlacklist(const std::string& url) {
   if (blacklisted_urls_.erase(url)) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_REMOVED_FROM_BLACKLIST);
   }
 }