| Index: extensions/browser/guest_view/extension_view/extension_view_guest.cc
|
| diff --git a/extensions/browser/guest_view/extension_view/extension_view_guest.cc b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
|
| index 79922ee2997ea40ec2daeb76fc397373d2c6836f..b9f73f49dc33ed697424b4f3f0e0df469d3fa81f 100644
|
| --- a/extensions/browser/guest_view/extension_view/extension_view_guest.cc
|
| +++ b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
|
| @@ -6,17 +6,19 @@
|
|
|
| #include "base/strings/string_util.h"
|
| #include "components/crx_file/id_util.h"
|
| +#include "components/guest_view/browser/guest_view_event.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/common/result_codes.h"
|
| #include "extensions/browser/api/extensions_api_client.h"
|
| #include "extensions/browser/bad_message.h"
|
| #include "extensions/browser/guest_view/extension_view/extension_view_constants.h"
|
| -#include "extensions/browser/guest_view/guest_view_event.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/extension_messages.h"
|
| #include "extensions/strings/grit/extensions_strings.h"
|
|
|
| using content::WebContents;
|
| +using guest_view::GuestViewBase;
|
| +using guest_view::GuestViewEvent;
|
| using namespace extensions::core_api;
|
|
|
| namespace extensions {
|
| @@ -36,7 +38,7 @@ ExtensionViewGuest::~ExtensionViewGuest() {
|
| }
|
|
|
| // static
|
| -extensions::GuestViewBase* ExtensionViewGuest::Create(
|
| +GuestViewBase* ExtensionViewGuest::Create(
|
| content::WebContents* owner_web_contents) {
|
| return new ExtensionViewGuest(owner_web_contents);
|
| }
|
| @@ -141,7 +143,7 @@ void ExtensionViewGuest::DidCommitProvisionalLoadForFrame(
|
| ReplaceFirstSubstringAfterOffset(&relative_url, 0, prefix, "");
|
|
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| - args->SetString(guestview::kUrl, relative_url);
|
| + args->SetString(guest_view::kUrl, relative_url);
|
| DispatchEventToView(
|
| new GuestViewEvent(extensionview::kEventLoadCommit, args.Pass()));
|
| }
|
|
|