| Index: chrome/browser/chromeos/options/wifi_config_view.h
|
| diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
|
| index 8589b0cdcc07101c9b849a8af2334eaf84a2f53e..1988cfe8dace2368e5cecaa207da7754eefdea63 100644
|
| --- a/chrome/browser/chromeos/options/wifi_config_view.h
|
| +++ b/chrome/browser/chromeos/options/wifi_config_view.h
|
| @@ -60,7 +60,7 @@ class WifiConfigView : public ChildNetworkConfigView,
|
|
|
| // views::TextfieldController
|
| virtual void ContentsChanged(views::Textfield* sender,
|
| - const string16& new_contents) OVERRIDE;
|
| + const base::string16& new_contents) OVERRIDE;
|
| virtual bool HandleKeyEvent(views::Textfield* sender,
|
| const ui::KeyEvent& key_event) OVERRIDE;
|
|
|
| @@ -75,7 +75,7 @@ class WifiConfigView : public ChildNetworkConfigView,
|
| virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE;
|
|
|
| // ChildNetworkConfigView
|
| - virtual string16 GetTitle() const OVERRIDE;
|
| + virtual base::string16 GetTitle() const OVERRIDE;
|
| virtual views::View* GetInitiallyFocusedView() OVERRIDE;
|
| virtual bool CanLogin() OVERRIDE;
|
| virtual bool Login() OVERRIDE;
|
|
|