Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc |
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc |
index 759e48d39cbc11d5ea13f84eafbcfe527f345648..7ca7de636cc0867436133b21524387dc5c89fdeb 100644 |
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc |
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc |
@@ -51,7 +51,7 @@ extensions::GuestViewBase* ExtensionOptionsGuest::Create( |
content::BrowserContext* browser_context, |
int guest_instance_id) { |
if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) { |
- return NULL; |
+ return nullptr; |
} |
return new ExtensionOptionsGuest(browser_context, guest_instance_id); |
} |
@@ -66,21 +66,21 @@ void ExtensionOptionsGuest::CreateWebContents( |
create_params.GetString(extensionoptions::kExtensionId, &extension_id); |
if (!crx_file::id_util::IdIsValid(extension_id)) { |
- callback.Run(NULL); |
+ callback.Run(nullptr); |
return; |
} |
if (crx_file::id_util::IdIsValid(embedder_extension_id) && |
extension_id != embedder_extension_id) { |
// Extensions cannot embed other extensions' options pages. |
- callback.Run(NULL); |
+ callback.Run(nullptr); |
return; |
} |
GURL extension_url = |
extensions::Extension::GetBaseURLFromExtensionId(extension_id); |
if (!extension_url.is_valid()) { |
- callback.Run(NULL); |
+ callback.Run(nullptr); |
return; |
} |
@@ -91,7 +91,7 @@ void ExtensionOptionsGuest::CreateWebContents( |
registry->enabled_extensions().GetByID(extension_id); |
options_page_ = extensions::OptionsPageInfo::GetOptionsPage(extension); |
if (!options_page_.is_valid()) { |
- callback.Run(NULL); |
+ callback.Run(nullptr); |
return; |
} |
@@ -159,7 +159,7 @@ content::WebContents* ExtensionOptionsGuest::OpenURLFromTab( |
content::WebContents* source, |
const content::OpenURLParams& params) { |
if (!extension_options_guest_delegate_) |
- return NULL; |
+ return nullptr; |
// Don't allow external URLs with the CURRENT_TAB disposition be opened in |
// this guest view, change the disposition to NEW_FOREGROUND_TAB. |