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

Side by Side Diff: chrome/browser/thumbnails/thumbnail_list_source.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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/thumbnails/thumbnail_list_source.h" 5 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 if (num_mv_with_thumb > 0) { 157 if (num_mv_with_thumb > 0) {
158 out.push_back("<h2>TopSites URLs with Thumbnails</h2>\n"); 158 out.push_back("<h2>TopSites URLs with Thumbnails</h2>\n");
159 RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, true, &out); 159 RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, true, &out);
160 } 160 }
161 if (num_mv_with_thumb < num_mv) { 161 if (num_mv_with_thumb < num_mv) {
162 out.push_back("<h2>TopSites URLs without Thumbnails</h2>\n"); 162 out.push_back("<h2>TopSites URLs without Thumbnails</h2>\n");
163 RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, false, &out); 163 RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, false, &out);
164 } 164 }
165 out.push_back(kHtmlFooter); 165 out.push_back(kHtmlFooter);
166 166
167 std::string out_html = JoinString(out, ""); 167 std::string out_html = base::JoinString(out, base::StringPiece());
168 callback.Run(base::RefCountedString::TakeString(&out_html)); 168 callback.Run(base::RefCountedString::TakeString(&out_html));
169 } 169 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698