| Index: chrome/browser/chromeos/options/wimax_config_view.h
|
| diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h
|
| index b4e03ef945444f236fb6300c8eed802d1875df1c..bc577bea5ab89ecce9042f0e6c5e95c38e3adfd7 100644
|
| --- a/chrome/browser/chromeos/options/wimax_config_view.h
|
| +++ b/chrome/browser/chromeos/options/wimax_config_view.h
|
| @@ -37,7 +37,7 @@ class WimaxConfigView : 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;
|
|
|
| @@ -46,7 +46,7 @@ class WimaxConfigView : public ChildNetworkConfigView,
|
| const ui::Event& event) 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;
|
|
|