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

chrome/browser/ui/omnibox/omnibox_edit_model.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/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
+#include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_log.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
@@ skipping 971 matching lines @@
   // determine what keyword, if any, is applicable.
   //
   // If MaybeAcceptKeywordBySpace() accepts the keyword and returns true, that
   // 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) {
+void OmniboxEditModel::OnPopupBoundsChanged(const gfx::Rect& bounds) {
   if (InstantController* instant = controller_->GetInstant())
-    instant->SetOmniboxBounds(bounds);
+    instant->SetPopupBounds(bounds);
+}
+
+void OmniboxEditModel::OnOmniboxBoundsChanged(const gfx::Rect& omnibox_bounds,
+                                              const gfx::Rect& parent_bounds) {
+  if (InstantController* instant = controller_->GetInstant()) {
+    int start = omnibox_bounds.x();
+    int end = parent_bounds.x() + parent_bounds.width() -
+              omnibox_bounds.width() - start;
+    if (base::i18n::IsRTL()) {
+      int tmp = start;

[dhollowa, 2012/11/28 16:44:08]

std::swap(start, end)

[melevin, 2012/11/28 20:28:19]

I've always been conflicted about this function. It certainly looks cleaner but
is it worth it to #include <algorithm> just to swap two numbers?

[dhollowa, 2012/11/28 20:44:33]

Yes.  It expresses intent clearly and adds to readability.

+      start = end;
+      end = tmp;
+    }
+    instant->SetMarginSize(start, end);
+  }
 }
 
 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();
     const AutocompleteResult::const_iterator match(result.default_match());
@@ skipping 16 matching lines @@
     }
 
     popup_->OnResultChanged();
     OnPopupDataChanged(inline_autocomplete_text, NULL, keyword,
                        is_keyword_hint);
   } else {
     popup_->OnResultChanged();
   }
 
   if (popup_->IsOpen()) {
-    PopupBoundsChangedTo(popup_->view()->GetTargetBounds());
+    OnPopupBoundsChanged(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());
+    OnPopupBoundsChanged(gfx::Rect());
     NotifySearchTabHelper();
   }
 
   if (InstantController* instant = controller_->GetInstant())
     instant->HandleAutocompleteResults(*autocomplete_controller_->providers());
 }
 
 bool OmniboxEditModel::query_in_progress() const {
   return !autocomplete_controller_->done();
 }
@@ skipping 213 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);
 }