chrome/browser/ui/gtk/location_bar_view_gtk.h - Issue 6306011: Remove wstring from autocomplete.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.h

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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

« chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc ('K') | « chrome/browser/ui/gtk/gtk_util.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h

===================================================================

--- chrome/browser/ui/gtk/location_bar_view_gtk.h (revision 72388)

+++ chrome/browser/ui/gtk/location_bar_view_gtk.h (working copy)

@@ -95,7 +95,7 @@

virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus);

virtual void OnAutocompleteWillAccept();

// For this implementation, the parameter is ignored.

- virtual bool OnCommitSuggestedText(const std::wstring& typed_text);

+ virtual bool OnCommitSuggestedText(const string16& typed_text);

virtual bool AcceptCurrentInstantPreview();

virtual void OnPopupBoundsChanged(const gfx::Rect& bounds);

virtual void OnAutocompleteAccept(const GURL& url,

@@ -108,7 +108,7 @@

virtual void OnSetFocus();

virtual void OnInputInProgress(bool in_progress);

virtual SkBitmap GetFavIcon() const;

- virtual std::wstring GetTitle() const;

+ virtual string16 GetTitle() const;

// Implement the LocationBar interface.

virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type);

@@ -313,10 +313,10 @@

void SetInfoText();

// Set the keyword text for the Search BLAH: keyword box.

- void SetKeywordLabel(const std::wstring& keyword);

+ void SetKeywordLabel(const string16& keyword);

// Set the keyword text for the "Press tab to search BLAH" hint box.

- void SetKeywordHintLabel(const std::wstring& keyword);

+ void SetKeywordHintLabel(const string16& keyword);

void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);

@@ -423,7 +423,7 @@

bool show_keyword_hint_;

// The last search keyword that was shown via the |tab_to_search_box_|.

- std::wstring last_keyword_;

+ string16 last_keyword_;

// True if we should update the instant controller when the edit text changes.

bool update_instant_;

Property changes on: chrome/browser/ui/gtk/location_bar_view_gtk.h

___________________________________________________________________

Deleted: svn:mergeinfo