Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: chrome/browser/guest_view/guest_view_base.cc

Issue 444113003: Remove dependency of chrome in GuestViewBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/guest_view/guest_view_base.cc
diff --git a/chrome/browser/guest_view/guest_view_base.cc b/chrome/browser/guest_view/guest_view_base.cc
index 1300cfbb50d4b30240729963b6c2ff87dfcf8b4a..98007ac17e92a818ee7d2c7ec00b7a9b811a64e5 100644
--- a/chrome/browser/guest_view/guest_view_base.cc
+++ b/chrome/browser/guest_view/guest_view_base.cc
@@ -6,17 +6,14 @@
#include "base/lazy_instance.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/guest_view/app_view/app_view_guest.h"
-#include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/guest_view_manager.h"
-#include "chrome/browser/guest_view/web_view/web_view_guest.h"
-#include "chrome/common/content_settings.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/event_router.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
@@ -228,25 +225,6 @@ bool GuestViewBase::IsGuest(WebContents* web_contents) {
return !!GuestViewBase::FromWebContents(web_contents);
}
-// static
-void GuestViewBase::GetDefaultContentSettingRules(
- RendererContentSettingRules* rules,
- bool incognito) {
- rules->image_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- incognito));
-
- rules->script_rules.push_back(
- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ALLOW,
- std::string(),
- incognito));
-}
-
base::WeakPtr<GuestViewBase> GuestViewBase::AsWeakPtr() {
return weak_ptr_factory_.GetWeakPtr();
}
@@ -443,7 +421,5 @@ void GuestViewBase::CompleteInit(const std::string& embedder_extension_id,
// static
void GuestViewBase::RegisterGuestViewTypes() {
- AppViewGuest::Register();
- ExtensionOptionsGuest::Register();
- WebViewGuest::Register();
+ extensions::ExtensionsAPIClient::Get()->RegisterGuestViewType();
}

Powered by Google App Engine
This is Rietveld 408576698