diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
| commit | a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 (patch) | |
| tree | e05c5e6959584c84cef55647d9bf1e4bbb2217d9 /app/combobox_model.h | |
| parent | e7afe2458ed03e907601cd3c05dc5f253f824d88 (diff) | |
| download | chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.zip chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.gz chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.bz2 | |
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
Diffstat (limited to 'app/combobox_model.h')
| -rw-r--r-- | app/combobox_model.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <string> +#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_ |