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

Unified Diff: chrome/browser/chromeos/login/network_screen.h

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 months 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/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,
« no previous file with comments | « chrome/browser/bookmarks/recently_used_folders_combo_model.cc ('k') | chrome/browser/chromeos/login/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698