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

Unified Diff: chrome/browser/chromeos/options/network_config_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
Index: chrome/browser/chromeos/options/network_config_view.h
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 9e4def59f5aa3555cc4520368b7c493b15aae0cd..f7ab0764780a3896a70ec79a8bcf01c7cb29d2eb 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -54,7 +54,8 @@ class NetworkConfigView : public views::DialogDelegateView,
gfx::NativeWindow GetNativeWindow() const;
// views::DialogDelegate methods.
- virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+ virtual base::string16 GetDialogButtonLabel(
+ ui::DialogButton button) const OVERRIDE;
virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
virtual bool Cancel() OVERRIDE;
virtual bool Accept() OVERRIDE;
@@ -62,7 +63,7 @@ class NetworkConfigView : public views::DialogDelegateView,
virtual views::View* GetInitiallyFocusedView() OVERRIDE;
// views::WidgetDelegate methods.
- virtual string16 GetWindowTitle() const OVERRIDE;
+ virtual base::string16 GetWindowTitle() const OVERRIDE;
virtual ui::ModalType GetModalType() const OVERRIDE;
// views::View overrides.
@@ -121,7 +122,7 @@ class ChildNetworkConfigView : public views::View {
virtual ~ChildNetworkConfigView();
// Get the title to show for the dialog.
- virtual string16 GetTitle() const = 0;
+ virtual base::string16 GetTitle() const = 0;
// Returns view that should be focused on dialog activation.
virtual views::View* GetInitiallyFocusedView() = 0;
« no previous file with comments | « chrome/browser/chromeos/options/cert_library.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698