Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5667)

Unified Diff: chrome/test/base/test_location_bar.h

Issue 7550050: Convert LocationBar::GetInputString from wstring to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gurl string16 Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/test/base/test_location_bar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/test_location_bar.h
diff --git a/chrome/test/base/test_location_bar.h b/chrome/test/base/test_location_bar.h
index 26437c7aabfa6adffbbd85a41622cebc3ebad617..d3ba264b233f7e4fa03513ee2074ddabf7f49145 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_;
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/test/base/test_location_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698