| Index: chrome/browser/chromeos/login/network_screen.h
|
| diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h
|
| index 194607acda1b209afcaaf5d0414bd27abdd33e8c..f272a1a7a1ea6994adaba5fb6e43748cc6784ee4 100644
|
| --- a/chrome/browser/chromeos/login/network_screen.h
|
| +++ b/chrome/browser/chromeos/login/network_screen.h
|
| @@ -6,10 +6,9 @@
|
| #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
|
| #pragma once
|
|
|
| -#include <string>
|
| -
|
| #include "base/task.h"
|
| #include "base/timer.h"
|
| +#include "base/string16.h"
|
| #include "chrome/browser/chromeos/cros/network_library.h"
|
| #include "chrome/browser/chromeos/login/network_screen_delegate.h"
|
| #include "chrome/browser/chromeos/login/language_switch_menu.h"
|
| @@ -37,7 +36,7 @@ class NetworkScreen : public ViewScreen<NetworkSelectionView>,
|
|
|
| // ComboboxModel implementation:
|
| virtual int GetItemCount();
|
| - virtual std::wstring GetItemAt(int index);
|
| + virtual string16 GetItemAt(int index);
|
|
|
| // views::Combobox::Listener implementation:
|
| virtual void ItemChanged(views::Combobox* sender,
|
|
|