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

Side by Side Diff: chrome/browser/content_settings/content_settings_utils.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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/content_settings/content_settings_utils.h" 5 #include "chrome/browser/content_settings/content_settings_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool include_incognito) { 183 bool include_incognito) {
184 scoped_ptr<base::Value> value( 184 scoped_ptr<base::Value> value(
185 GetContentSettingValue(provider, primary_url, secondary_url, 185 GetContentSettingValue(provider, primary_url, secondary_url,
186 content_type, resource_identifier, 186 content_type, resource_identifier,
187 include_incognito)); 187 include_incognito));
188 return ValueToContentSetting(value.get()); 188 return ValueToContentSetting(value.get());
189 } 189 }
190 190
191 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 191 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
192 RendererContentSettingRules* rules) { 192 RendererContentSettingRules* rules) {
193 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", 193 map->GetSettingsForOneType(
194 &(rules->image_rules)); 194 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
195 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", 195 map->GetSettingsForOneType(
196 &(rules->script_rules)); 196 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
197 } 197 }
198 198
199 } // namespace content_settings 199 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698