Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: components/bookmarks/browser/bookmark_expanded_state_tracker.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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>
8
7 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
9 #include "base/values.h" 11 #include "base/values.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 12 #include "components/bookmarks/browser/bookmark_model.h"
11 #include "components/bookmarks/browser/bookmark_utils.h" 13 #include "components/bookmarks/browser/bookmark_utils.h"
12 #include "components/bookmarks/common/bookmark_pref_names.h" 14 #include "components/bookmarks/common/bookmark_pref_names.h"
13 15
14 namespace bookmarks { 16 namespace bookmarks {
15 17
16 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker( 18 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
(...skipping 22 matching lines...) Expand all
39 41
40 const base::ListValue* value = 42 const base::ListValue* value =
41 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes); 43 pref_service_->GetList(prefs::kBookmarkEditorExpandedNodes);
42 if (!value) 44 if (!value)
43 return nodes; 45 return nodes;
44 46
45 bool changed = false; 47 bool changed = false;
46 for (base::ListValue::const_iterator i = value->begin(); 48 for (base::ListValue::const_iterator i = value->begin();
47 i != value->end(); ++i) { 49 i != value->end(); ++i) {
48 std::string value; 50 std::string value;
49 int64 node_id; 51 int64_t node_id;
50 const BookmarkNode* node; 52 const BookmarkNode* node;
51 if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) && 53 if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) &&
52 (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL && 54 (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL &&
53 node->is_folder()) { 55 node->is_folder()) {
54 nodes.insert(node); 56 nodes.insert(node);
55 } else { 57 } else {
56 changed = true; 58 changed = true;
57 } 59 }
58 } 60 }
59 if (changed) 61 if (changed)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 base::ListValue values; 107 base::ListValue values;
106 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { 108 for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
107 values.Set(values.GetSize(), 109 values.Set(values.GetSize(),
108 new base::StringValue(base::Int64ToString((*i)->id()))); 110 new base::StringValue(base::Int64ToString((*i)->id())));
109 } 111 }
110 112
111 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values); 113 pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values);
112 } 114 }
113 115
114 } // namespace bookmarks 116 } // namespace bookmarks
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698