| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bookmarks/bookmark_expanded_state_tracker.h" | 5 #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 BookmarkExpandedStateTracker::Nodes | 29 BookmarkExpandedStateTracker::Nodes |
| 30 BookmarkExpandedStateTracker::GetExpandedNodes() { | 30 BookmarkExpandedStateTracker::GetExpandedNodes() { |
| 31 Nodes nodes; | 31 Nodes nodes; |
| 32 if (!bookmark_model_->loaded()) | 32 if (!bookmark_model_->loaded()) |
| 33 return nodes; | 33 return nodes; |
| 34 | 34 |
| 35 if (!pref_service_) | 35 if (!pref_service_) |
| 36 return nodes; | 36 return nodes; |
| 37 | 37 |
| 38 const ListValue* value = | 38 const base::ListValue* value = |
| 39 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes); | 39 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes); |
| 40 if (!value) | 40 if (!value) |
| 41 return nodes; | 41 return nodes; |
| 42 | 42 |
| 43 bool changed = false; | 43 bool changed = false; |
| 44 for (ListValue::const_iterator i = value->begin(); i != value->end(); ++i) { | 44 for (base::ListValue::const_iterator i = value->begin(); |
| 45 i != value->end(); ++i) { |
| 45 std::string value; | 46 std::string value; |
| 46 int64 node_id; | 47 int64 node_id; |
| 47 const BookmarkNode* node; | 48 const BookmarkNode* node; |
| 48 if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) && | 49 if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) && |
| 49 (node = bookmark_model_->GetNodeByID(node_id)) != NULL && | 50 (node = bookmark_model_->GetNodeByID(node_id)) != NULL && |
| 50 node->is_folder()) { | 51 node->is_folder()) { |
| 51 nodes.insert(node); | 52 nodes.insert(node); |
| 52 } else { | 53 } else { |
| 53 changed = true; | 54 changed = true; |
| 54 } | 55 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 void BookmarkExpandedStateTracker::BookmarkAllNodesRemoved( | 91 void BookmarkExpandedStateTracker::BookmarkAllNodesRemoved( |
| 91 BookmarkModel* model) { | 92 BookmarkModel* model) { |
| 92 // Ask for the nodes again, which removes any nodes that were deleted. | 93 // Ask for the nodes again, which removes any nodes that were deleted. |
| 93 GetExpandedNodes(); | 94 GetExpandedNodes(); |
| 94 } | 95 } |
| 95 | 96 |
| 96 void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) { | 97 void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) { |
| 97 if (!pref_service_) | 98 if (!pref_service_) |
| 98 return; | 99 return; |
| 99 | 100 |
| 100 ListValue values; | 101 base::ListValue values; |
| 101 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { | 102 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { |
| 102 values.Set(values.GetSize(), | 103 values.Set(values.GetSize(), |
| 103 new StringValue(base::Int64ToString((*i)->id()))); | 104 new base::StringValue(base::Int64ToString((*i)->id()))); |
| 104 } | 105 } |
| 105 | 106 |
| 106 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values); | 107 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values); |
| 107 } | 108 } |
| OLD | NEW |