| Index: chrome/browser/ui/views/uninstall_view.cc
|
| diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
|
| index 28a798e754d009c90161c35951f82eecaf07cee4..d22ce7649b286cc485df9dfb1824a2c7b1eed27e 100644
|
| --- a/chrome/browser/ui/views/uninstall_view.cc
|
| +++ b/chrome/browser/ui/views/uninstall_view.cc
|
| @@ -7,8 +7,6 @@
|
| #include "base/message_loop.h"
|
| #include "base/process_util.h"
|
| #include "base/run_loop.h"
|
| -#include "base/string16.h"
|
| -#include "base/utf_string_conversions.h"
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/ui/uninstall_browser_prompt.h"
|
| #include "chrome/common/chrome_result_codes.h"
|
| @@ -30,7 +28,6 @@ UninstallView::UninstallView(int* user_selection,
|
| delete_profile_(NULL),
|
| change_default_browser_(NULL),
|
| browsers_combo_(NULL),
|
| - browsers_(NULL),
|
| user_selection_(*user_selection),
|
| quit_closure_(quit_closure) {
|
| SetupControls();
|
| @@ -161,7 +158,7 @@ string16 UninstallView::GetItemAt(int index) {
|
| DCHECK_LT(index, static_cast<int>(browsers_->size()));
|
| BrowsersMap::const_iterator i = browsers_->begin();
|
| std::advance(i, index);
|
| - return WideToUTF16Hack(i->first);
|
| + return i->first;
|
| }
|
|
|
| namespace chrome {
|
|
|