| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/bookmark_tree_model.h" | 5 #include "chrome/browser/ui/gtk/bookmark_tree_model.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 12 #include "chrome/browser/gtk/bookmark_utils_gtk.h" | 12 #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" |
| 13 #include "chrome/browser/gtk/gtk_theme_provider.h" | 13 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 const char* kCellRendererTextKey = "__CELL_RENDERER_TEXT__"; | 17 const char* kCellRendererTextKey = "__CELL_RENDERER_TEXT__"; |
| 18 | 18 |
| 19 void AddSingleNodeToTreeStore(GtkTreeStore* store, const BookmarkNode* node, | 19 void AddSingleNodeToTreeStore(GtkTreeStore* store, const BookmarkNode* node, |
| 20 GtkTreeIter *iter, GtkTreeIter* parent) { | 20 GtkTreeIter *iter, GtkTreeIter* parent) { |
| 21 gtk_tree_store_append(store, iter, parent); | 21 gtk_tree_store_append(store, iter, parent); |
| 22 // It would be easy to show a different icon when the folder is open (as they | 22 // It would be easy to show a different icon when the folder is open (as they |
| 23 // do on Windows, for example), using pixbuf-expander-closed and | 23 // do on Windows, for example), using pixbuf-expander-closed and |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 ret_val = UTF8ToUTF16(utf8str); | 222 ret_val = UTF8ToUTF16(utf8str); |
| 223 g_value_unset(&value); | 223 g_value_unset(&value); |
| 224 } else { | 224 } else { |
| 225 NOTREACHED() << "Impossible type mismatch"; | 225 NOTREACHED() << "Impossible type mismatch"; |
| 226 } | 226 } |
| 227 | 227 |
| 228 return ret_val; | 228 return ret_val; |
| 229 } | 229 } |
| 230 | 230 |
| 231 } // namespace bookmark_utils | 231 } // namespace bookmark_utils |
| OLD | NEW |