Minor cosmetic changes to OmniboxEditModel and OmniboxController.

This follow-up on some late comments by pkasting on https://codereview.chromium.org/14698028

BUG=

Review URL: https://chromiumcodereview.appspot.com/17426004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207429 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 18 insertions, 24 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_result.cc b/chrome/browser/autocomplete/autocomplete_result.cc
index c723d3f..38a0edf 100644
--- a/chrome/browser/autocomplete/autocomplete_result.cc
+++ b/chrome/browser/autocomplete/autocomplete_result.cc
@@ -134,8 +134,8 @@ void AutocompleteResult::SortAndCull(const AutocompleteInput& input,
   default_match_ = begin();
 
   // Set the alternate nav URL.
-  alternate_nav_url_ = default_match_ == end() ? GURL() :
-      ComputeAlternateNavUrl(input, *default_match_);
+  alternate_nav_url_ = (default_match_ == end()) ?
+      GURL() : ComputeAlternateNavUrl(input, *default_match_);
 }
 
 bool AutocompleteResult::HasCopiedMatches() const {
@@ -207,10 +207,10 @@ void AutocompleteResult::Validate() const {
 GURL AutocompleteResult::ComputeAlternateNavUrl(
     const AutocompleteInput& input,
     const AutocompleteMatch& match) {
-  return (input.type() == AutocompleteInput::UNKNOWN &&
-          AutocompleteMatch::IsSearchType(match.type) &&
-          match.transition != content::PAGE_TRANSITION_KEYWORD &&
-          input.canonicalized_url() != match.destination_url) ?
+  return ((input.type() == AutocompleteInput::UNKNOWN) &&
+          (AutocompleteMatch::IsSearchType(match.type)) &&
+          (match.transition != content::PAGE_TRANSITION_KEYWORD) &&
+          (input.canonicalized_url() != match.destination_url)) ?
       input.canonicalized_url() : GURL();
 }
 
diff --git a/chrome/browser/autocomplete/autocomplete_result.h b/chrome/browser/autocomplete/autocomplete_result.h
index 2da5320..8cc667c 100644
--- a/chrome/browser/autocomplete/autocomplete_result.h
+++ b/chrome/browser/autocomplete/autocomplete_result.h
@@ -120,7 +120,8 @@ class AutocompleteResult {
 #endif
 
   // Compute the "alternate navigation URL" for a given match. This is obtained
-  // by interpreting the user input directly as a URL.
+  // by interpreting the user input directly as a URL. See comments on
+  // |alternate_nav_url_|.
   static GURL ComputeAlternateNavUrl(const AutocompleteInput& input,
                                      const AutocompleteMatch& match);
 
diff --git a/chrome/browser/ui/omnibox/omnibox_controller.cc b/chrome/browser/ui/omnibox/omnibox_controller.cc
index 601bbf3..fa57f8b 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller.cc
+++ b/chrome/browser/ui/omnibox/omnibox_controller.cc
@@ -254,17 +254,6 @@ void OmniboxController::InvalidateCurrentMatch() {
   current_match_ = AutocompleteMatch();
 }
 
-const AutocompleteMatch& OmniboxController::CurrentMatch(
-    GURL* alternate_nav_url) const {
-  if (alternate_nav_url && current_match_.destination_url.is_valid()) {
-    *alternate_nav_url = AutocompleteResult::ComputeAlternateNavUrl(
-        autocomplete_controller_->input(), current_match_);
-  }
-
-  return current_match_;
-}
-
-
 void OmniboxController::ClearPopupKeywordMode() const {
   if (popup_->IsOpen() &&
       popup_->selected_line_state() == OmniboxPopupModel::KEYWORD)
diff --git a/chrome/browser/ui/omnibox/omnibox_controller.h b/chrome/browser/ui/omnibox/omnibox_controller.h
index 0cb1555..f3ce3bb 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_controller.h
@@ -86,9 +86,9 @@ class OmniboxController : public AutocompleteControllerDelegate {
   // LocationBarView, making this accessor unnecessary.
   OmniboxPopupModel* popup_model() const { return popup_; }
 
-  const string16& gray_suggestion() const { return gray_suggestion_; }
+  const AutocompleteMatch& current_match() const { return current_match_; }
 
-  const AutocompleteMatch& CurrentMatch(GURL* alternate_nav_url) const;
+  const string16& gray_suggestion() const { return gray_suggestion_; }
 
   // Turns off keyword mode for the current match.
   void ClearPopupKeywordMode() const;
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index 223576a..8ea2426 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -187,10 +187,14 @@ void OmniboxEditModel::RestoreState(const State& state) {
 AutocompleteMatch OmniboxEditModel::CurrentMatch(
     GURL* alternate_nav_url) const {
   // If we have a valid match use it. Otherwise get one for the current text.
-  AutocompleteMatch match =
-      omnibox_controller_->CurrentMatch(alternate_nav_url);
-  if (!match.destination_url.is_valid())
+  AutocompleteMatch match = omnibox_controller_->current_match();
+
+  if (!match.destination_url.is_valid()) {
     GetInfoForCurrentText(&match, alternate_nav_url);
+  } else if (alternate_nav_url) {
+    *alternate_nav_url = AutocompleteResult::ComputeAlternateNavUrl(
+        autocomplete_controller()->input(), match);
+  }
   return match;
 }
 
@@ -1130,7 +1134,7 @@ void OmniboxEditModel::OnCurrentMatchChanged(bool is_temporary_set_by_instant) {
   has_temporary_text_ = is_temporary_set_by_instant;
   is_temporary_text_set_by_instant_ = is_temporary_set_by_instant;
 
-  const AutocompleteMatch& match = omnibox_controller_->CurrentMatch(NULL);
+  const AutocompleteMatch& match = omnibox_controller_->current_match();
 
   if (is_temporary_set_by_instant) {
     view_->OnTemporaryTextMaybeChanged(