| Index: components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc
|
| diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc
|
| deleted file mode 100644
|
| index 2a7bf344e5dff076db196afbd050e5ab82dc59f1..0000000000000000000000000000000000000000
|
| --- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc
|
| +++ /dev/null
|
| @@ -1,110 +0,0 @@
|
| -// Copyright 2014 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.
|
| -
|
| -#include "components/bookmarks/core/browser/bookmark_expanded_state_tracker.h"
|
| -
|
| -#include "base/prefs/pref_service.h"
|
| -#include "base/strings/string_number_conversions.h"
|
| -#include "base/values.h"
|
| -#include "components/bookmarks/core/browser/bookmark_model.h"
|
| -#include "components/bookmarks/core/browser/bookmark_utils.h"
|
| -#include "components/bookmarks/core/common/bookmark_pref_names.h"
|
| -
|
| -BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
|
| - BookmarkModel* bookmark_model,
|
| - PrefService* pref_service)
|
| - : bookmark_model_(bookmark_model),
|
| - pref_service_(pref_service) {
|
| - bookmark_model->AddObserver(this);
|
| -}
|
| -
|
| -BookmarkExpandedStateTracker::~BookmarkExpandedStateTracker() {
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::SetExpandedNodes(const Nodes& nodes) {
|
| - UpdatePrefs(nodes);
|
| -}
|
| -
|
| -BookmarkExpandedStateTracker::Nodes
|
| -BookmarkExpandedStateTracker::GetExpandedNodes() {
|
| - Nodes nodes;
|
| - if (!bookmark_model_->loaded())
|
| - return nodes;
|
| -
|
| - if (!pref_service_)
|
| - return nodes;
|
| -
|
| - const base::ListValue* value =
|
| - pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes);
|
| - if (!value)
|
| - return nodes;
|
| -
|
| - bool changed = false;
|
| - for (base::ListValue::const_iterator i = value->begin();
|
| - i != value->end(); ++i) {
|
| - std::string value;
|
| - int64 node_id;
|
| - const BookmarkNode* node;
|
| - if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) &&
|
| - (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL &&
|
| - node->is_folder()) {
|
| - nodes.insert(node);
|
| - } else {
|
| - changed = true;
|
| - }
|
| - }
|
| - if (changed)
|
| - UpdatePrefs(nodes);
|
| - return nodes;
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) {
|
| - if (ids_reassigned) {
|
| - // If the ids change we can't trust the value in preferences and need to
|
| - // reset it.
|
| - SetExpandedNodes(Nodes());
|
| - }
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::BookmarkModelChanged() {
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::BookmarkModelBeingDeleted(
|
| - BookmarkModel* model) {
|
| - model->RemoveObserver(this);
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::BookmarkNodeRemoved(
|
| - BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int old_index,
|
| - const BookmarkNode* node,
|
| - const std::set<GURL>& removed_urls) {
|
| - if (!node->is_folder())
|
| - return; // Only care about folders.
|
| -
|
| - // Ask for the nodes again, which removes any nodes that were deleted.
|
| - GetExpandedNodes();
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::BookmarkAllNodesRemoved(
|
| - BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) {
|
| - // Ask for the nodes again, which removes any nodes that were deleted.
|
| - GetExpandedNodes();
|
| -}
|
| -
|
| -void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) {
|
| - if (!pref_service_)
|
| - return;
|
| -
|
| - base::ListValue values;
|
| - for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
|
| - values.Set(values.GetSize(),
|
| - new base::StringValue(base::Int64ToString((*i)->id())));
|
| - }
|
| -
|
| - pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values);
|
| -}
|
|
|