diff options
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete.cc | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index a735947..bbd4509 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" + #include "chrome/browser/autocomplete/autocomplete.h" #include <algorithm> @@ -12,8 +14,6 @@ #include "chrome/browser/autocomplete/keyword_provider.h" #include "chrome/browser/autocomplete/search_provider.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/external_protocol_handler.h" -#include "chrome/browser/history_tab_ui.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/common/gfx/text_elider.h" @@ -26,6 +26,15 @@ #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" +#include "net/url_request/url_request.h" + +// TODO(port): Port this file. +#if defined(OS_WIN) +#include "chrome/browser/external_protocol_handler.h" +#include "chrome/browser/history_tab_ui.h" +#else +#include "chrome/common/temp_scaffolding_stubs.h" +#endif using base::TimeDelta; @@ -176,7 +185,8 @@ AutocompleteInput::Type AutocompleteInput::Parse(const std::wstring& text, // more likely a search (for the answer to a math problem) than a URL. url_parse::Component components[4]; const bool found_ipv4 = - url_canon::FindIPv4Components(text.c_str(), parts->host, components); + url_canon::FindIPv4Components(WideToUTF8(text).c_str(), + parts->host, components); DCHECK(found_ipv4); for (size_t i = 0; i < arraysize(components); ++i) { if (!components[i].is_nonempty()) @@ -418,9 +428,15 @@ void AutocompleteProvider::SetProfile(Profile* profile) { std::wstring AutocompleteProvider::StringForURLDisplay( const GURL& url, bool check_accept_lang) { +#if !defined(OS_MACOSX) return gfx::ElideUrl(url, ChromeFont(), 0, check_accept_lang && profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring()); +#else + // TODO(port): need gfx::ElideUrl and ChromeFont + NOTIMPLEMENTED(); + return std::wstring(); +#endif } void AutocompleteProvider::UpdateStarredStateOfMatches() { |