Trivial cleanup of a recently added function:

* Make const
* Move to be with other function (not variables) in header
* Move in C++ file to match order in header
Review URL: http://codereview.chromium.org/67274

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

2 files changed, 21 insertions, 20 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index cbca69d..8755834 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -186,7 +186,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
     DCHECK(found_ipv4);
     for (size_t i = 0; i < arraysize(components); ++i) {
       if (!components[i].is_nonempty())
-        return UNKNOWN;
+        return desired_tld.empty() ? UNKNOWN : REQUESTED_URL;
     }
     return URL;
   }
@@ -462,20 +462,6 @@ void AutocompleteProvider::SetProfile(Profile* profile) {
   profile_ = profile;
 }
 
-std::wstring AutocompleteProvider::StringForURLDisplay(
-    const GURL& url,
-    bool check_accept_lang) {
-#if !defined(OS_MACOSX)
-  return gfx::GetCleanStringFromUrl(url, check_accept_lang && profile_ ?
-      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) :
-      std::wstring(), NULL, NULL);
-#else
-  // TODO(port): need gfx::GetCleanStringFromUrl
-  NOTIMPLEMENTED();
-  return UTF8ToWide(url.spec());
-#endif
-}
-
 void AutocompleteProvider::UpdateStarredStateOfMatches() {
   if (matches_.empty())
     return;
@@ -490,6 +476,20 @@ void AutocompleteProvider::UpdateStarredStateOfMatches() {
     i->starred = bookmark_model->IsBookmarked(GURL(i->destination_url));
 }
 
+std::wstring AutocompleteProvider::StringForURLDisplay(
+    const GURL& url,
+    bool check_accept_lang) const {
+#if !defined(OS_MACOSX)
+  return gfx::GetCleanStringFromUrl(url, (check_accept_lang && profile_) ?
+      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring(),
+      NULL, NULL);
+#else
+  // TODO(port): need gfx::GetCleanStringFromUrl
+  NOTIMPLEMENTED();
+  return UTF8ToWide(url.spec());
+#endif
+}
+
 // AutocompleteResult ---------------------------------------------------------
 
 // static
diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index 98fb7e5..4c78aa1 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -532,6 +532,12 @@ class AutocompleteProvider
   // profile's bookmark bar model.
   void UpdateStarredStateOfMatches();
 
+  // A convenience function to call gfx::GetCleanStringFromUrl() with the
+  // current set of "Accept Languages" when check_accept_lang is true.
+  // Otherwise, it's called with an empty list.
+  std::wstring StringForURLDisplay(const GURL& url,
+                                   bool check_accept_lang) const;
+
   // The profile associated with the AutocompleteProvider.  Reference is not
   // owned by us.
   Profile* profile_;
@@ -543,11 +549,6 @@ class AutocompleteProvider
   // The name of this provider.  Used for logging.
   const char* name_;
 
-  // A convenience function to call gfx::GetCleanStringFromUrl() with the
-  // current set of "Accept Languages" when check_accept_lang is true.
-  // Otherwise, it's called with an empty list.
-  std::wstring StringForURLDisplay(const GURL& url, bool check_accept_lang);
-
  private:
   // A suggested upper bound for how many matches a provider should return.
   // TODO(pkasting): http://b/1111299 , http://b/933133 This should go away once