| Index: extensions/shell/browser/shell_extension_system.cc
|
| diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
|
| index f924ab5af62c43c537474e603488c2fc25b04505..22ffb62fd9fdd1424773a884b17d968b13e58ba3 100644
|
| --- a/extensions/shell/browser/shell_extension_system.cc
|
| +++ b/extensions/shell/browser/shell_extension_system.cc
|
| @@ -100,7 +100,7 @@ void ShellExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
|
| }
|
|
|
| ExtensionService* ShellExtensionSystem::extension_service() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| RuntimeData* ShellExtensionSystem::runtime_data() {
|
| @@ -108,11 +108,11 @@ RuntimeData* ShellExtensionSystem::runtime_data() {
|
| }
|
|
|
| ManagementPolicy* ShellExtensionSystem::management_policy() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| SharedUserScriptMaster* ShellExtensionSystem::shared_user_script_master() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ProcessManager* ShellExtensionSystem::process_manager() {
|
| @@ -120,11 +120,11 @@ ProcessManager* ShellExtensionSystem::process_manager() {
|
| }
|
|
|
| StateStore* ShellExtensionSystem::state_store() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| StateStore* ShellExtensionSystem::rules_store() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| InfoMap* ShellExtensionSystem::info_map() {
|
| @@ -142,19 +142,19 @@ EventRouter* ShellExtensionSystem::event_router() {
|
| }
|
|
|
| WarningService* ShellExtensionSystem::warning_service() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| Blacklist* ShellExtensionSystem::blacklist() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ErrorConsole* ShellExtensionSystem::error_console() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| InstallVerifier* ShellExtensionSystem::install_verifier() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| QuotaService* ShellExtensionSystem::quota_service() {
|
| @@ -183,7 +183,7 @@ const OneShotEvent& ShellExtensionSystem::ready() const {
|
| }
|
|
|
| ContentVerifier* ShellExtensionSystem::content_verifier() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| scoped_ptr<ExtensionSet> ShellExtensionSystem::GetDependentExtensions(
|
| @@ -195,7 +195,7 @@ scoped_ptr<ExtensionSet> ShellExtensionSystem::GetDependentExtensions(
|
| DeclarativeUserScriptMaster*
|
| ShellExtensionSystem::GetDeclarativeUserScriptMasterByExtension(
|
| const ExtensionId& extension_id) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| } // namespace extensions
|
|
|