Chromium Code Reviews| 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..a8a11281e9a7aeb86fde29f9128ad9a54a1a7ca0 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()->OnRegisterGuestViewType(); |
|
Fady Samuel
2014/08/07 20:10:48
Rename OnRegisterGuestViewType to RegisterGuestVie
Xi Han
2014/08/07 20:36:07
Done.
|
| } |