diff options
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_editor.h')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_editor.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_editor.h b/chrome/browser/bookmarks/bookmark_editor.h index a1dbcf8..63d3ccf 100644 --- a/chrome/browser/bookmarks/bookmark_editor.h +++ b/chrome/browser/bookmarks/bookmark_editor.h @@ -4,11 +4,12 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_ +#pragma once -#include <string> #include <utility> #include <vector> +#include "base/string16.h" #include "gfx/native_widget_types.h" class BookmarkNode; @@ -42,12 +43,9 @@ class BookmarkEditor { NEW_FOLDER }; - EditDetails() : type(NEW_URL), existing_node(NULL) {} - - explicit EditDetails(const BookmarkNode* node) - : type(EXISTING_NODE), - existing_node(node) { - } + EditDetails(); + explicit EditDetails(const BookmarkNode* node); + ~EditDetails(); // See description of enum value for details. Type type; @@ -57,7 +55,7 @@ class BookmarkEditor { // If type == NEW_FOLDER, this is the urls/title pairs to add to the // folder. - std::vector<std::pair<GURL, std::wstring> > urls; + std::vector<std::pair<GURL, string16> > urls; }; // Shows the bookmark editor. The bookmark editor allows editing an |