| Index: extensions/browser/guest_view/app_view/app_view_guest.cc
|
| diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
|
| index ec14cc8d1471bc2be243e6d89a63805574803366..d89fd60ee03db355f207103a7950675a6e1ecf32 100644
|
| --- a/extensions/browser/guest_view/app_view/app_view_guest.cc
|
| +++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
|
| @@ -92,7 +92,7 @@ GuestViewBase* AppViewGuest::Create(content::BrowserContext* browser_context,
|
| int guest_instance_id) {
|
| if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| extensions::switches::kEnableAppView)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return new AppViewGuest(browser_context, guest_instance_id);
|
| }
|
| @@ -109,7 +109,7 @@ AppViewGuest::~AppViewGuest() {
|
| }
|
|
|
| WindowController* AppViewGuest::GetExtensionWindowController() const {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| content::WebContents* AppViewGuest::GetAssociatedWebContents() const {
|
| @@ -147,13 +147,13 @@ void AppViewGuest::CreateWebContents(
|
| const WebContentsCreatedCallback& callback) {
|
| std::string app_id;
|
| if (!create_params.GetString(appview::kAppID, &app_id)) {
|
| - callback.Run(NULL);
|
| + callback.Run(nullptr);
|
| return;
|
| }
|
|
|
| - const base::DictionaryValue* data = NULL;
|
| + const base::DictionaryValue* data = nullptr;
|
| if (!create_params.GetDictionary(appview::kData, &data)) {
|
| - callback.Run(NULL);
|
| + callback.Run(nullptr);
|
| return;
|
| }
|
|
|
| @@ -165,7 +165,7 @@ void AppViewGuest::CreateWebContents(
|
|
|
| if (!guest_extension || !guest_extension->is_platform_app() ||
|
| !embedder_extension | !embedder_extension->is_platform_app()) {
|
| - callback.Run(NULL);
|
| + callback.Run(nullptr);
|
| return;
|
| }
|
|
|
| @@ -221,7 +221,7 @@ void AppViewGuest::CompleteCreateWebContents(
|
| const Extension* guest_extension,
|
| const WebContentsCreatedCallback& callback) {
|
| if (!url.is_valid()) {
|
| - callback.Run(NULL);
|
| + callback.Run(nullptr);
|
| return;
|
| }
|
| url_ = url;
|
| @@ -244,7 +244,7 @@ void AppViewGuest::LaunchAppAndFireEvent(
|
| extension_host->extension()->id(),
|
| app_runtime::OnEmbedRequested::kEventName);
|
| if (!has_event_listener) {
|
| - callback.Run(NULL);
|
| + callback.Run(nullptr);
|
| return;
|
| }
|
|
|
|
|