| OLD | NEW |
| 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" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/content_settings/cookie_settings.h" | 14 #include "chrome/browser/content_settings/cookie_settings.h" |
| 15 #include "chrome/browser/content_settings/host_content_settings_map.h" | 15 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 16 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co
nstants.h" | 16 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co
nstants.h" |
| 17 #include "chrome/browser/extensions/api/content_settings/content_settings_helper
s.h" | 17 #include "chrome/browser/extensions/api/content_settings/content_settings_helper
s.h" |
| 18 #include "chrome/browser/extensions/api/content_settings/content_settings_servic
e.h" |
| 18 #include "chrome/browser/extensions/api/content_settings/content_settings_store.
h" | 19 #include "chrome/browser/extensions/api/content_settings/content_settings_store.
h" |
| 19 #include "chrome/browser/extensions/api/preference/preference_api_constants.h" | 20 #include "chrome/browser/extensions/api/preference/preference_api_constants.h" |
| 20 #include "chrome/browser/extensions/api/preference/preference_helpers.h" | 21 #include "chrome/browser/extensions/api/preference/preference_helpers.h" |
| 21 #include "chrome/browser/plugins/plugin_finder.h" | 22 #include "chrome/browser/plugins/plugin_finder.h" |
| 22 #include "chrome/browser/plugins/plugin_installer.h" | 23 #include "chrome/browser/plugins/plugin_installer.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
| 25 #include "chrome/common/extensions/api/content_settings.h" | 26 #include "chrome/common/extensions/api/content_settings.h" |
| 26 #include "content/public/browser/plugin_service.h" | 27 #include "content/public/browser/plugin_service.h" |
| 27 #include "extensions/browser/extension_prefs.h" | 28 #include "extensions/browser/extension_prefs_scope.h" |
| 28 #include "extensions/common/error_utils.h" | 29 #include "extensions/common/error_utils.h" |
| 29 | 30 |
| 30 using content::BrowserThread; | 31 using content::BrowserThread; |
| 31 using content::PluginService; | 32 using content::PluginService; |
| 32 | 33 |
| 33 namespace Clear = extensions::api::content_settings::ContentSetting::Clear; | 34 namespace Clear = extensions::api::content_settings::ContentSetting::Clear; |
| 34 namespace Get = extensions::api::content_settings::ContentSetting::Get; | 35 namespace Get = extensions::api::content_settings::ContentSetting::Get; |
| 35 namespace Set = extensions::api::content_settings::ContentSetting::Set; | 36 namespace Set = extensions::api::content_settings::ContentSetting::Set; |
| 36 namespace pref_helpers = extensions::preference_helpers; | 37 namespace pref_helpers = extensions::preference_helpers; |
| 37 namespace pref_keys = extensions::preference_api_constants; | 38 namespace pref_keys = extensions::preference_api_constants; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 } else { | 81 } else { |
| 81 // Incognito profiles can't access regular mode ever, they only exist in | 82 // Incognito profiles can't access regular mode ever, they only exist in |
| 82 // split mode. | 83 // split mode. |
| 83 if (GetProfile()->IsOffTheRecord()) { | 84 if (GetProfile()->IsOffTheRecord()) { |
| 84 error_ = keys::kIncognitoContextError; | 85 error_ = keys::kIncognitoContextError; |
| 85 return false; | 86 return false; |
| 86 } | 87 } |
| 87 } | 88 } |
| 88 | 89 |
| 89 ContentSettingsStore* store = | 90 ContentSettingsStore* store = |
| 90 ExtensionPrefs::Get(GetProfile())->content_settings_store(); | 91 ContentSettingsService::Get(GetProfile())->content_settings_store(); |
| 91 store->ClearContentSettingsForExtension(extension_id(), scope); | 92 store->ClearContentSettingsForExtension(extension_id(), scope); |
| 92 | 93 |
| 93 return true; | 94 return true; |
| 94 } | 95 } |
| 95 | 96 |
| 96 bool ContentSettingsContentSettingGetFunction::RunImpl() { | 97 bool ContentSettingsContentSettingGetFunction::RunImpl() { |
| 97 ContentSettingsType content_type; | 98 ContentSettingsType content_type; |
| 98 EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); | 99 EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); |
| 99 | 100 |
| 100 scoped_ptr<Get::Params> params(Get::Params::Create(*args_)); | 101 scoped_ptr<Get::Params> params(Get::Params::Create(*args_)); |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 } | 232 } |
| 232 } | 233 } |
| 233 | 234 |
| 234 if (scope == kExtensionPrefsScopeIncognitoSessionOnly && | 235 if (scope == kExtensionPrefsScopeIncognitoSessionOnly && |
| 235 !GetProfile()->HasOffTheRecordProfile()) { | 236 !GetProfile()->HasOffTheRecordProfile()) { |
| 236 error_ = pref_keys::kIncognitoSessionOnlyErrorMessage; | 237 error_ = pref_keys::kIncognitoSessionOnlyErrorMessage; |
| 237 return false; | 238 return false; |
| 238 } | 239 } |
| 239 | 240 |
| 240 ContentSettingsStore* store = | 241 ContentSettingsStore* store = |
| 241 ExtensionPrefs::Get(GetProfile())->content_settings_store(); | 242 ContentSettingsService::Get(GetProfile())->content_settings_store(); |
| 242 store->SetExtensionContentSetting(extension_id(), primary_pattern, | 243 store->SetExtensionContentSetting(extension_id(), primary_pattern, |
| 243 secondary_pattern, content_type, | 244 secondary_pattern, content_type, |
| 244 resource_identifier, setting, scope); | 245 resource_identifier, setting, scope); |
| 245 return true; | 246 return true; |
| 246 } | 247 } |
| 247 | 248 |
| 248 bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunImpl() { | 249 bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunImpl() { |
| 249 ContentSettingsType content_type; | 250 ContentSettingsType content_type; |
| 250 EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); | 251 EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); |
| 251 | 252 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 282 SetResult(list); | 283 SetResult(list); |
| 283 BrowserThread::PostTask( | 284 BrowserThread::PostTask( |
| 284 BrowserThread::UI, FROM_HERE, base::Bind( | 285 BrowserThread::UI, FROM_HERE, base::Bind( |
| 285 &ContentSettingsContentSettingGetResourceIdentifiersFunction:: | 286 &ContentSettingsContentSettingGetResourceIdentifiersFunction:: |
| 286 SendResponse, | 287 SendResponse, |
| 287 this, | 288 this, |
| 288 true)); | 289 true)); |
| 289 } | 290 } |
| 290 | 291 |
| 291 } // namespace extensions | 292 } // namespace extensions |
| OLD | NEW |