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

Side by Side Diff: chrome/browser/managed_mode/managed_mode_site_list.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
OLDNEW
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/managed_mode/managed_mode_site_list.h" 5 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
6 6
7 #include "base/json/json_file_value_serializer.h" 7 #include "base/json/json_file_value_serializer.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 12
13 using base::DictionaryValue; 13 using base::DictionaryValue;
14 using base::ListValue; 14 using base::ListValue;
15 using base::Value; 15 using base::Value;
16 16
17 const int kSitelistFormatVersion = 1; 17 const int kSitelistFormatVersion = 1;
18 18
19 const char kCategoriesKey[] = "categories"; 19 const char kCategoriesKey[] = "categories";
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 GURL base_url = 247 GURL base_url =
248 extensions::Extension::GetBaseURLFromExtensionId(extension_id_); 248 extensions::Extension::GetBaseURLFromExtensionId(extension_id_);
249 GURL thumbnail_url = base_url.Resolve(thumbnail); 249 GURL thumbnail_url = base_url.Resolve(thumbnail);
250 if (!thumbnail_url.is_valid()) { 250 if (!thumbnail_url.is_valid()) {
251 LOG(ERROR) << "Invalid thumbnail"; 251 LOG(ERROR) << "Invalid thumbnail";
252 return; 252 return;
253 } 253 }
254 254
255 dest->SetString(kThumbnailUrlKey, thumbnail_url.spec()); 255 dest->SetString(kThumbnailUrlKey, thumbnail_url.spec());
256 } 256 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698