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

Side by Side Diff: chrome/browser/ui/webui/invalidations_message_handler.cc

Issue 2051663003: base::ListValue::Append cleanup: pass unique_ptr instead of the released pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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 "chrome/browser/ui/webui/invalidations_message_handler.h" 5 #include "chrome/browser/ui/webui/invalidations_message_handler.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 10 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
9 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
10 #include "components/invalidation/impl/invalidation_logger.h" 12 #include "components/invalidation/impl/invalidation_logger.h"
11 #include "components/invalidation/impl/profile_invalidation_provider.h" 13 #include "components/invalidation/impl/profile_invalidation_provider.h"
12 #include "components/invalidation/public/invalidation_handler.h" 14 #include "components/invalidation/public/invalidation_handler.h"
13 #include "components/invalidation/public/invalidation_service.h" 15 #include "components/invalidation/public/invalidation_service.h"
14 #include "content/public/browser/web_ui.h" 16 #include "content/public/browser/web_ui.h"
15 17
16 namespace invalidation { 18 namespace invalidation {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 const std::string& handler_name, 97 const std::string& handler_name,
96 const syncer::ObjectIdCountMap& ids) { 98 const syncer::ObjectIdCountMap& ids) {
97 base::ListValue list_of_objects; 99 base::ListValue list_of_objects;
98 for (syncer::ObjectIdCountMap::const_iterator it = ids.begin(); 100 for (syncer::ObjectIdCountMap::const_iterator it = ids.begin();
99 it != ids.end(); 101 it != ids.end();
100 ++it) { 102 ++it) {
101 std::unique_ptr<base::DictionaryValue> dic(new base::DictionaryValue()); 103 std::unique_ptr<base::DictionaryValue> dic(new base::DictionaryValue());
102 dic->SetString("name", (it->first).name()); 104 dic->SetString("name", (it->first).name());
103 dic->SetInteger("source", (it->first).source()); 105 dic->SetInteger("source", (it->first).source());
104 dic->SetInteger("totalCount", it->second); 106 dic->SetInteger("totalCount", it->second);
105 list_of_objects.Append(dic.release()); 107 list_of_objects.Append(std::move(dic));
106 } 108 }
107 web_ui()->CallJavascriptFunctionUnsafe("chrome.invalidations.updateIds", 109 web_ui()->CallJavascriptFunctionUnsafe("chrome.invalidations.updateIds",
108 base::StringValue(handler_name), 110 base::StringValue(handler_name),
109 list_of_objects); 111 list_of_objects);
110 } 112 }
111 void InvalidationsMessageHandler::OnDebugMessage( 113 void InvalidationsMessageHandler::OnDebugMessage(
112 const base::DictionaryValue& details) {} 114 const base::DictionaryValue& details) {}
113 115
114 void InvalidationsMessageHandler::OnInvalidation( 116 void InvalidationsMessageHandler::OnInvalidation(
115 const syncer::ObjectIdInvalidationMap& new_invalidations) { 117 const syncer::ObjectIdInvalidationMap& new_invalidations) {
116 std::unique_ptr<base::ListValue> invalidations_list = 118 std::unique_ptr<base::ListValue> invalidations_list =
117 new_invalidations.ToValue(); 119 new_invalidations.ToValue();
118 web_ui()->CallJavascriptFunctionUnsafe( 120 web_ui()->CallJavascriptFunctionUnsafe(
119 "chrome.invalidations.logInvalidations", *invalidations_list); 121 "chrome.invalidations.logInvalidations", *invalidations_list);
120 } 122 }
121 123
122 void InvalidationsMessageHandler::OnDetailedStatus( 124 void InvalidationsMessageHandler::OnDetailedStatus(
123 const base::DictionaryValue& network_details) { 125 const base::DictionaryValue& network_details) {
124 web_ui()->CallJavascriptFunctionUnsafe( 126 web_ui()->CallJavascriptFunctionUnsafe(
125 "chrome.invalidations.updateDetailedStatus", network_details); 127 "chrome.invalidations.updateDetailedStatus", network_details);
126 } 128 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698