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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_api.cc

Issue 11827026: Overhaul JSON Schema Compiler to support a number of features required to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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/extensions/api/content_settings/content_settings_api.h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return false; 197 return false;
198 } 198 }
199 } 199 }
200 200
201 std::string resource_identifier; 201 std::string resource_identifier;
202 if (params->details.resource_identifier.get()) 202 if (params->details.resource_identifier.get())
203 resource_identifier = params->details.resource_identifier->id; 203 resource_identifier = params->details.resource_identifier->id;
204 204
205 std::string setting_str; 205 std::string setting_str;
206 EXTENSION_FUNCTION_VALIDATE( 206 EXTENSION_FUNCTION_VALIDATE(
207 params->details.setting.value().GetAsString(&setting_str)); 207 params->details.setting->GetAsString(&setting_str));
208 ContentSetting setting; 208 ContentSetting setting;
209 EXTENSION_FUNCTION_VALIDATE( 209 EXTENSION_FUNCTION_VALIDATE(
210 helpers::StringToContentSetting(setting_str, &setting)); 210 helpers::StringToContentSetting(setting_str, &setting));
211 EXTENSION_FUNCTION_VALIDATE( 211 EXTENSION_FUNCTION_VALIDATE(
212 HostContentSettingsMap::IsSettingAllowedForType(profile()->GetPrefs(), 212 HostContentSettingsMap::IsSettingAllowedForType(profile()->GetPrefs(),
213 setting, 213 setting,
214 content_type)); 214 content_type));
215 215
216 ExtensionPrefsScope scope = kExtensionPrefsScopeRegular; 216 ExtensionPrefsScope scope = kExtensionPrefsScopeRegular;
217 bool incognito = false; 217 bool incognito = false;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 true)); 295 true));
296 } 296 }
297 297
298 // static 298 // static
299 void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting( 299 void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(
300 const std::vector<webkit::WebPluginInfo>* plugins) { 300 const std::vector<webkit::WebPluginInfo>* plugins) {
301 g_testing_plugins_ = plugins; 301 g_testing_plugins_ = plugins;
302 } 302 }
303 303
304 } // namespace extensions 304 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698