| Index: extensions/shell/browser/shell_extensions_browser_client.cc
|
| diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
|
| index a4aee60d862cedb4944f6bb6f9856f8aafcaa06a..3192ab2a963eed860d49e88bb2e4d9e9ce25ad2e 100644
|
| --- a/extensions/shell/browser/shell_extensions_browser_client.cc
|
| +++ b/extensions/shell/browser/shell_extensions_browser_client.cc
|
| @@ -83,7 +83,7 @@ bool ShellExtensionsBrowserClient::HasOffTheRecordContext(
|
| BrowserContext* ShellExtensionsBrowserClient::GetOffTheRecordContext(
|
| BrowserContext* context) {
|
| // app_shell only supports a single context.
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| BrowserContext* ShellExtensionsBrowserClient::GetOriginalContext(
|
| @@ -115,7 +115,7 @@ ShellExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
|
| const base::FilePath& directory_path,
|
| const std::string& content_security_policy,
|
| bool send_cors_header) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| bool ShellExtensionsBrowserClient::AllowCrossRendererResourceLoad(
|
| @@ -145,7 +145,7 @@ void ShellExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
|
|
|
| ProcessManagerDelegate*
|
| ShellExtensionsBrowserClient::GetProcessManagerDelegate() const {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| scoped_ptr<ExtensionHostDelegate>
|
| @@ -172,7 +172,7 @@ bool ShellExtensionsBrowserClient::IsRunningInForcedAppMode() {
|
| ApiActivityMonitor* ShellExtensionsBrowserClient::GetApiActivityMonitor(
|
| BrowserContext* context) {
|
| // app_shell doesn't monitor API function calls or events.
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ExtensionSystemProvider*
|
| @@ -194,7 +194,7 @@ ShellExtensionsBrowserClient::CreateRuntimeAPIDelegate(
|
|
|
| ComponentExtensionResourceManager*
|
| ShellExtensionsBrowserClient::GetComponentExtensionResourceManager() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void ShellExtensionsBrowserClient::BroadcastEventToRenderers(
|
| @@ -216,7 +216,7 @@ void ShellExtensionsBrowserClient::BroadcastEventToRenderers(
|
| }
|
|
|
| net::NetLog* ShellExtensionsBrowserClient::GetNetLog() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| } // namespace extensions
|
|
|