| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/bookmarks/browser/bookmark_expanded_state_tracker.h" | 5 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes); | 43 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes); |
| 44 if (!value) | 44 if (!value) |
| 45 return nodes; | 45 return nodes; |
| 46 | 46 |
| 47 bool changed = false; | 47 bool changed = false; |
| 48 for (base::ListValue::const_iterator i = value->begin(); | 48 for (base::ListValue::const_iterator i = value->begin(); |
| 49 i != value->end(); ++i) { | 49 i != value->end(); ++i) { |
| 50 std::string value; | 50 std::string value; |
| 51 int64_t node_id; | 51 int64_t node_id; |
| 52 const BookmarkNode* node; | 52 const BookmarkNode* node; |
| 53 if (i->GetAsString(&value) && base::StringToInt64(value, &node_id) && | 53 if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) && |
| 54 (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL && | 54 (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL && |
| 55 node->is_folder()) { | 55 node->is_folder()) { |
| 56 nodes.insert(node); | 56 nodes.insert(node); |
| 57 } else { | 57 } else { |
| 58 changed = true; | 58 changed = true; |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 if (changed) | 61 if (changed) |
| 62 UpdatePrefs(nodes); | 62 UpdatePrefs(nodes); |
| 63 return nodes; | 63 return nodes; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 base::ListValue values; | 107 base::ListValue values; |
| 108 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { | 108 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { |
| 109 values.Set(values.GetSize(), | 109 values.Set(values.GetSize(), |
| 110 new base::Value(base::Int64ToString((*i)->id()))); | 110 new base::Value(base::Int64ToString((*i)->id()))); |
| 111 } | 111 } |
| 112 | 112 |
| 113 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values); | 113 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values); |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace bookmarks | 116 } // namespace bookmarks |
| OLD | NEW |