Index: components/guest_view/browser/guest_view_manager.cc |
diff --git a/extensions/browser/guest_view/guest_view_manager.cc b/components/guest_view/browser/guest_view_manager.cc |
similarity index 95% |
rename from extensions/browser/guest_view/guest_view_manager.cc |
rename to components/guest_view/browser/guest_view_manager.cc |
index 0d6b28beb2d8b5b440f0b9ac65d7f6699b4fc581..1adca02f5dfc8ff834ac004e0fc64ad67ef181ae 100644 |
--- a/extensions/browser/guest_view/guest_view_manager.cc |
+++ b/components/guest_view/browser/guest_view_manager.cc |
@@ -2,9 +2,14 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "extensions/browser/guest_view/guest_view_manager.h" |
+#include "components/guest_view/browser/guest_view_manager.h" |
+#include "base/macros.h" |
#include "base/strings/stringprintf.h" |
+#include "components/guest_view/browser/guest_view_base.h" |
+#include "components/guest_view/browser/guest_view_manager_delegate.h" |
+#include "components/guest_view/browser/guest_view_manager_factory.h" |
+#include "components/guest_view/common/guest_view_constants.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/render_process_host.h" |
@@ -14,19 +19,14 @@ |
#include "content/public/common/child_process_host.h" |
#include "content/public/common/result_codes.h" |
#include "content/public/common/url_constants.h" |
-#include "extensions/browser/guest_view/guest_view_base.h" |
-#include "extensions/browser/guest_view/guest_view_manager_delegate.h" |
-#include "extensions/browser/guest_view/guest_view_manager_factory.h" |
-#include "extensions/common/guest_view/guest_view_constants.h" |
#include "net/base/escape.h" |
#include "url/gurl.h" |
using content::BrowserContext; |
using content::SiteInstance; |
using content::WebContents; |
-using guestview::GuestViewManagerDelegate; |
-namespace extensions { |
+namespace guestview { |
// static |
GuestViewManagerFactory* GuestViewManager::factory_ = nullptr; |
@@ -273,7 +273,10 @@ void GuestViewManager::DispatchEvent(const std::string& event_name, |
scoped_ptr<base::DictionaryValue> args, |
GuestViewBase* guest, |
int instance_id) { |
- delegate_->DispatchEvent(event_name, args.Pass(), guest, instance_id); |
+ // TODO(fsamuel): GuestViewManager should probably do something more useful |
+ // here like log an error if the event could not be dispatched. |
+ ignore_result( |
+ delegate_->DispatchEvent(event_name, args.Pass(), guest, instance_id)); |
} |
content::WebContents* GuestViewManager::GetGuestByInstanceID( |
@@ -372,4 +375,4 @@ bool GuestViewManager::ElementInstanceKey::operator==( |
(element_instance_id == other.element_instance_id); |
} |
-} // namespace extensions |
+} // namespace guestview |