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 162 matching lines @@
       extended_enabled_(extended_enabled),
       instant_enabled_(false),
       use_local_preview_only_(use_local_preview_only),
       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),
+      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 228 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_ || (start_margin_ == margin && width_ == width))
     return;
 
-  start_margin_ = start;
-  end_margin_ = end;
+  start_margin_ = margin;
+  width_ = width;
   if (loader_)
-    loader_->SetMarginSize(start_margin_, end_margin_);
+    loader_->SetStartMarginAndWidth(margin, 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_ && !loader_)
     return;
 
@@ skipping 505 matching lines @@
 }
 
 void InstantController::InstantLoaderRenderViewCreated() {
   if (!extended_enabled_)
     return;
 
   // Ensure the searchbox API has the correct initial state.
   loader_->SetDisplayInstantResults(instant_enabled_);
   loader_->SearchModeChanged(search_mode_);
   loader_->KeyCaptureChanged(omnibox_focus_state_ == OMNIBOX_FOCUS_INVISIBLE);
-  loader_->SetMarginSize(start_margin_, end_margin_);
+  loader_->SetStartMarginAndWidth(start_margin_, width_);
   loader_->InitializeFonts();
 }
 
 void InstantController::OmniboxLostFocus(gfx::NativeView view_gaining_focus) {
   // If the preview is showing custom NTP content, don't hide it, commit it
   // (no matter where the user clicked) or try to recreate it.
   if (model_.mode().is_ntp())
     return;
 
   // If the preview is not showing at all, recreate it if it's stale.
@@ skipping 109 matching lines @@
 
 void InstantController::ResetInstantTab() {
   // 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_search() && !use_local_preview_only_) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->contents()) {
       instant_tab_.reset(new InstantTab(this, active_tab));
       instant_tab_->Init();
       instant_tab_->SetDisplayInstantResults(instant_enabled_);
-      instant_tab_->SetMarginSize(start_margin_, end_margin_);
+      instant_tab_->SetStartMarginAndWidth(start_margin_, width_);
       instant_tab_->InitializeFonts();
     }
 
     // Hide the |loader_| since we are now using |instant_tab_| instead.
     HideLoader();
   } else {
     instant_tab_.reset();
   }
 }
 
@@ skipping 191 matching lines @@
       RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_BLOCKED_BY_BLACKLIST);
       LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
           "GetInstantURL: Instant URL blacklisted: url=%s",
           instant_url->c_str()));
       return false;
     }
   }
 
   return true;
 }