From a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sun, 22 Aug 2010 16:49:37 +0000 Subject: Remove wstrings from bookmarks, part 12. - This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16 instead of a wstring. - This entailed changing the base class, ComboboxModel, and shaving a herd of yaks. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3159031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98 --- app/combobox_model.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/combobox_model.h') diff --git a/app/combobox_model.h b/app/combobox_model.h index 0159014..da27135 100644 --- a/app/combobox_model.h +++ b/app/combobox_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define APP_COMBOBOX_MODEL_H_ #pragma once -#include +#include "base/string16.h" // The interface for models backing a combobox. class ComboboxModel { @@ -17,7 +17,7 @@ class ComboboxModel { virtual int GetItemCount() = 0; // Return the string that should be used to represent a given item. - virtual std::wstring GetItemAt(int index) = 0; + virtual string16 GetItemAt(int index) = 0; }; #endif // APP_COMBOBOX_MODEL_H_ -- cgit v1.1