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 9b82badfe1508ed2d3819d1a650d5e013db5ffe5..672315c7bce9c2916856e4cd3776a6dee8aafb36 100644 |
--- a/extensions/browser/guest_view/app_view/app_view_guest.cc |
+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc |
@@ -102,7 +102,7 @@ AppViewGuest::AppViewGuest(content::BrowserContext* browser_context, |
int guest_instance_id) |
: GuestView<AppViewGuest>(browser_context, guest_instance_id), |
app_view_guest_delegate_( |
- ExtensionsAPIClient::Get()->CreateAppViewGuestDelegate()), |
+ ExtensionsAPIClient::Get()->CreateAppViewGuestDelegate(this)), |
weak_ptr_factory_(this) { |
} |
@@ -134,10 +134,16 @@ bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) { |
return false; |
} |
-const char* AppViewGuest::GetAPINamespace() { |
+const char* AppViewGuest::GetAPINamespace() const { |
return appview::kEmbedderAPINamespace; |
} |
+base::string16 AppViewGuest::GetTaskName() const { |
+ if (!app_view_guest_delegate_) |
+ return base::string16(); |
Charlie Reis
2014/08/22 22:00:45
It still looks possible to return an empty string
Fady Samuel
2014/08/22 22:12:44
AppViewGuest will be used by app_shell which doesn
|
+ return app_view_guest_delegate_->GetTaskName(); |
+} |
+ |
void AppViewGuest::CreateWebContents( |
const std::string& embedder_extension_id, |
int embedder_render_process_id, |