Implement the Instant extended API startMargin, endMargin, and rtl properties and the onmarginchang…

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright (c) 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/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 991 matching lines @@
   // will have updated our state already, so in that case we don't also return
   // true from this function.
   return !(text_differs && allow_keyword_ui_change && !just_deleted_text &&
            no_selection && (selection_start == user_text_.length()) &&
            MaybeAcceptKeywordBySpace(user_text_));
 }
 
 void OmniboxEditModel::PopupBoundsChangedTo(const gfx::Rect& bounds) {
   InstantController* instant = controller_->GetInstant();
   if (instant)
+    instant->SetPopupBounds(bounds);
+}
+
+void OmniboxEditModel::OmniboxBoundsChangedTo(const gfx::Rect& bounds) {
+  InstantController* instant = controller_->GetInstant();
+  if (instant)
     instant->SetOmniboxBounds(bounds);
 }
 
 void OmniboxEditModel::OnResultChanged(bool default_match_changed) {
   const bool was_open = popup_->IsOpen();
   if (default_match_changed) {
     string16 inline_autocomplete_text;
     string16 keyword;
     bool is_keyword_hint = false;
     const AutocompleteResult& result = this->result();
@@ skipping 16 matching lines @@
       match->GetKeywordUIState(profile_, &keyword, &is_keyword_hint);
     }
 
     popup_->OnResultChanged();
     OnPopupDataChanged(inline_autocomplete_text, NULL, keyword,
                        is_keyword_hint);
   } else {
     popup_->OnResultChanged();
   }
 
+  // TODO(melevin): Find a better place to call this.
+  OmniboxBoundsChangedTo(view_->GetBounds());

[dhollowa, 2012/11/14 17:20:46]

The OmniboxView class holds a pointer to an OmniboxEditModel, so why not just
call this directly from OmniboxViewViews::OnBoundsChanged()?  I'd rename it to
OmniboxEditModel::OnOmniboxBoundsChanged() though.

[melevin, 2012/11/14 22:16:27]

Thanks, this is much cleaner.

+
   if (popup_->IsOpen()) {
     PopupBoundsChangedTo(popup_->view()->GetTargetBounds());
   } else if (was_open) {
     // Accepts the temporary text as the user text, because it makes little
     // sense to have temporary text when the popup is closed.
     InternalSetUserText(UserTextFromDisplayText(view_->GetText()));
     has_temporary_text_ = false;
     is_temporary_text_set_by_instant_ = false;
     PopupBoundsChangedTo(gfx::Rect());
     NotifySearchTabHelper();
@@ skipping 230 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }