| Index: chrome/test/pyautolib/pyautolib.h
|
| ===================================================================
|
| --- chrome/test/pyautolib/pyautolib.h (revision 73855)
|
| +++ chrome/test/pyautolib/pyautolib.h (working copy)
|
| @@ -135,23 +135,23 @@
|
| std::string _GetBookmarksAsJSON();
|
|
|
| // Editing of the bookmark model. Bookmarks are referenced by id.
|
| - // The id is a std::wstring, not an int64, for convenience, since
|
| + // The id is a string16, not an int64, for convenience, since
|
| // the python side gets IDs converted from a JSON representation
|
| // (which "extracts" into a string, not an int). Since IDs are
|
| // grabbed from the current model (and not generated), a conversion
|
| // is unnecessary. URLs are strings and not GURLs for a similar reason.
|
| // Bookmark or group (folder) creation:
|
| - bool AddBookmarkGroup(std::wstring& parent_id, int index,
|
| - std::wstring& title);
|
| - bool AddBookmarkURL(std::wstring& parent_id, int index,
|
| - std::wstring& title, std::wstring& url);
|
| + bool AddBookmarkGroup(const string16& parent_id, int index,
|
| + const string16& title);
|
| + bool AddBookmarkURL(const string16& parent_id, int index,
|
| + const string16& title, const string16& url);
|
| // Bookmark editing:
|
| - bool ReparentBookmark(std::wstring& id, std::wstring& new_parent_id,
|
| + bool ReparentBookmark(const string16& id, const string16& new_parent_id,
|
| int index);
|
| - bool SetBookmarkTitle(std::wstring& id, std::wstring& title);
|
| - bool SetBookmarkURL(std::wstring& id, std::wstring& url);
|
| + bool SetBookmarkTitle(const string16& id, const string16& title);
|
| + bool SetBookmarkURL(const string16& id, const string16& url);
|
| // Finally, bookmark deletion:
|
| - bool RemoveBookmark(std::wstring& id);
|
| + bool RemoveBookmark(const string16& id);
|
|
|
| // Get a handle to browser window at the given index, or NULL on failure.
|
| scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
|
|
|