diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/gtk/bookmark_tree_model.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/gtk/bookmark_tree_model.h')
| -rw-r--r-- | chrome/browser/gtk/bookmark_tree_model.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_tree_model.h b/chrome/browser/gtk/bookmark_tree_model.h index 80b1984..1d28fbd 100644 --- a/chrome/browser/gtk/bookmark_tree_model.h +++ b/chrome/browser/gtk/bookmark_tree_model.h @@ -1,12 +1,13 @@ -// 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. #ifndef CHROME_BROWSER_GTK_BOOKMARK_TREE_MODEL_H_ #define CHROME_BROWSER_GTK_BOOKMARK_TREE_MODEL_H_ +#pragma once -#include <string> #include "base/basictypes.h" +#include "base/string16.h" class BookmarkModel; class BookmarkNode; @@ -68,8 +69,8 @@ const BookmarkNode* CommitTreeStoreDifferencesBetween( // Returns the id field of the row pointed to by |iter|. int64 GetIdFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter); -// Returns the title field of the row pointed to by |iter|. -std::wstring GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter); +// Returns the title field in utf8 of the row pointed to by |iter|. +string16 GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter); } // namespace bookmark_utils |