summaryrefslogtreecommitdiffstats
path: root/extensions/browser/guest_view/web_view
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/browser/guest_view/web_view')
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.cc7
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.h3
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest_delegate.h5
3 files changed, 11 insertions, 4 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 76c353c..2276835 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -39,6 +39,7 @@
#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_messages.h"
+#include "extensions/strings/grit/extensions_strings.h"
#include "ipc/ipc_message_macros.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
@@ -172,10 +173,14 @@ int WebViewGuest::GetViewInstanceId(WebContents* contents) {
return guest->view_instance_id();
}
-const char* WebViewGuest::GetAPINamespace() {
+const char* WebViewGuest::GetAPINamespace() const {
return webview::kAPINamespace;
}
+int WebViewGuest::GetTaskPrefix() const {
+ return IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX;
+}
+
void WebViewGuest::CreateWebContents(
const std::string& embedder_extension_id,
int embedder_render_process_id,
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index 2e08ee3..28e9e88 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -74,7 +74,8 @@ class WebViewGuest : public GuestView<WebViewGuest>,
void SetZoom(double zoom_factor);
// GuestViewBase implementation.
- virtual const char* GetAPINamespace() OVERRIDE;
+ virtual const char* GetAPINamespace() const OVERRIDE;
+ virtual int GetTaskPrefix() const OVERRIDE;
virtual void CreateWebContents(
const std::string& embedder_extension_id,
int embedder_render_process_id,
diff --git a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
index 5a5caee..f2f087d 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
@@ -14,7 +14,7 @@ struct WebFindOptions;
namespace content {
class RenderViewHost;
class WebContents;
-}
+} // namespace content
namespace extensions {
@@ -22,7 +22,8 @@ class WebViewGuest;
class WebViewInternalFindFunction;
namespace api {
-namespace web_view_internal{
+namespace web_view_internal {
+
struct ContextMenuItem;
} // namespace web_view_internal
} // namespace api