ui/views/controls/webview/web_dialog_view.h - Issue 117983002: Prefix string16 with base:: in ui/.

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: ui/views/controls/webview/web_dialog_view.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/controls/webview/web_dialog_view.h

diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h

index bb2eb395e52d1fc8afa01e50855baf77edf23f0e..51d67eb88dc82460b85563f344799e92d4df8ef7 100644

--- a/ui/views/controls/webview/web_dialog_view.h

+++ b/ui/views/controls/webview/web_dialog_view.h

@@ -63,7 +63,7 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,

// Overridden from views::WidgetDelegate:

virtual bool CanResize() const OVERRIDE;

virtual ui::ModalType GetModalType() const OVERRIDE;

- virtual string16 GetWindowTitle() const OVERRIDE;

+ virtual base::string16 GetWindowTitle() const OVERRIDE;

virtual std::string GetWindowName() const OVERRIDE;

virtual void WindowClosing() OVERRIDE;

virtual views::View* GetContentsView() OVERRIDE;

@@ -75,7 +75,7 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,

// Overridden from ui::WebDialogDelegate:

virtual ui::ModalType GetDialogModalType() const OVERRIDE;

- virtual string16 GetDialogTitle() const OVERRIDE;

+ virtual base::string16 GetDialogTitle() const OVERRIDE;

virtual GURL GetDialogContentURL() const OVERRIDE;

virtual void GetWebUIMessageHandlers(

std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;