summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 20:41:20 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 20:41:20 +0000
commit2f3793d07ed30d063c3ffdd4a142c2fb6d7863fc (patch)
tree05c214ab7e67ae9e9a67dc38a946b1f717e2381e /chrome/browser/autocomplete
parentadd629b0032f53dfb83fda0bc3051817df986e02 (diff)
downloadchromium_src-2f3793d07ed30d063c3ffdd4a142c2fb6d7863fc.zip
chromium_src-2f3793d07ed30d063c3ffdd4a142c2fb6d7863fc.tar.gz
chromium_src-2f3793d07ed30d063c3ffdd4a142c2fb6d7863fc.tar.bz2
Some cleanups in response to brettw's comments to r10277.
* Remove build_config.h from a file that isn't using it. * Return something useful from StringForURLDisplay. * Use basictypes.h instead of build_config.h. Review URL: http://codereview.chromium.org/27099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete.cc5
-rw-r--r--chrome/browser/autocomplete/history_url_provider.cc3
-rw-r--r--chrome/browser/autocomplete/search_provider.cc2
3 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index bbd4509..5b031f527 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -2,12 +2,11 @@
// 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>
+#include "base/basictypes.h"
#include "base/string_util.h"
#include "chrome/browser/autocomplete/history_url_provider.h"
#include "chrome/browser/autocomplete/history_contents_provider.h"
@@ -435,7 +434,7 @@ std::wstring AutocompleteProvider::StringForURLDisplay(
#else
// TODO(port): need gfx::ElideUrl and ChromeFont
NOTIMPLEMENTED();
- return std::wstring();
+ return UTF8ToWide(url.spec());
#endif
}
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 539eac78..783af00 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -2,12 +2,11 @@
// 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/history_url_provider.h"
#include <algorithm>
+#include "base/basictypes.h"
#include "base/histogram.h"
#include "base/message_loop.h"
#include "base/string_util.h"
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 8c9a8e3..477543d 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -2,8 +2,6 @@
// 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/search_provider.h"
#include "base/message_loop.h"