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

Unified Diff: chrome/browser/chromeos/ui/echo_dialog_view.h

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/system/timezone_util.cc ('k') | chrome/browser/chromeos/ui/echo_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ui/echo_dialog_view.h
diff --git a/chrome/browser/chromeos/ui/echo_dialog_view.h b/chrome/browser/chromeos/ui/echo_dialog_view.h
index 517dbbb5fa7ec361d94ea6a8f48bd5a655ec833b..31faff3884a27d4e47a6a0be9d4b2f7a0e3b1a88 100644
--- a/chrome/browser/chromeos/ui/echo_dialog_view.h
+++ b/chrome/browser/chromeos/ui/echo_dialog_view.h
@@ -35,7 +35,7 @@ class EchoDialogView : public views::DialogDelegateView,
// url. Service name should be underlined in the dialog, and hovering over its
// label should display tooltip containing |origin|.
// The dialog will have both OK and Cancel buttons.
- void InitForEnabledEcho(const string16& service_name, const string16& origin);
+ void InitForEnabledEcho(const base::string16& service_name, const base::string16& origin);
// Initializes dialog layout that will be shown when echo extension is not
// allowed to redeem offers. The dialog will be showing a message that the
@@ -52,7 +52,7 @@ class EchoDialogView : public views::DialogDelegateView,
// views::DialogDelegate overrides.
virtual int GetDialogButtons() const OVERRIDE;
virtual int GetDefaultDialogButton() const OVERRIDE;
- virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+ virtual base::string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
virtual bool Cancel() OVERRIDE;
virtual bool Accept() OVERRIDE;
« no previous file with comments | « chrome/browser/chromeos/system/timezone_util.cc ('k') | chrome/browser/chromeos/ui/echo_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698