diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:10:14 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-08 18:10:14 +0000 |
| commit | 537de68dc3a6fdb5fe4a908e79e4cdca9d31e281 (patch) | |
| tree | a5077d9603551103076bcc19030021236df9db01 /chrome/test/base/test_location_bar.h | |
| parent | 69ba6253fee1319d1cf15f36667acadb33e01774 (diff) | |
| download | chromium_src-537de68dc3a6fdb5fe4a908e79e4cdca9d31e281.zip chromium_src-537de68dc3a6fdb5fe4a908e79e4cdca9d31e281.tar.gz chromium_src-537de68dc3a6fdb5fe4a908e79e4cdca9d31e281.tar.bz2 | |
Convert LocationBar::GetInputString from wstring to string16.
Also add OVERRIDE to the GTK+ and OSX implementations.
BUG=23581
Review URL: http://codereview.chromium.org/7550050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/test_location_bar.h')
| -rw-r--r-- | chrome/test/base/test_location_bar.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/base/test_location_bar.h b/chrome/test/base/test_location_bar.h index 26437c7..d3ba264 100644 --- a/chrome/test/base/test_location_bar.h +++ b/chrome/test/base/test_location_bar.h @@ -6,6 +6,7 @@ #define CHROME_TEST_BASE_TEST_LOCATION_BAR_H_ #pragma once +#include "base/string16.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "content/common/page_transition_types.h" @@ -16,7 +17,7 @@ class TestLocationBar : public LocationBar { TestLocationBar(); virtual ~TestLocationBar(); - void set_input_string(const std::wstring& input_string) { + void set_input_string(const string16& input_string) { input_string_ = input_string; } void set_disposition(WindowOpenDisposition disposition) { @@ -30,7 +31,7 @@ class TestLocationBar : public LocationBar { virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE {} virtual void SetSuggestedText(const string16& text, InstantCompleteBehavior behavior) OVERRIDE {} - virtual std::wstring GetInputString() const OVERRIDE; + virtual string16 GetInputString() const OVERRIDE; virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; virtual PageTransition::Type GetPageTransition() const OVERRIDE; virtual void AcceptInput() OVERRIDE {} @@ -49,7 +50,7 @@ class TestLocationBar : public LocationBar { // Test-supplied values that will be returned through the LocationBar // interface. - std::wstring input_string_; + string16 input_string_; WindowOpenDisposition disposition_; PageTransition::Type transition_; |