OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "extensions/browser/guest_view/guest_view_base.h" | 5 #include "extensions/browser/guest_view/guest_view_base.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "components/ui/zoom/page_zoom.h" | 9 #include "components/ui/zoom/page_zoom.h" |
10 #include "components/ui/zoom/zoom_controller.h" | 10 #include "components/ui/zoom/zoom_controller.h" |
11 #include "content/public/browser/navigation_details.h" | 11 #include "content/public/browser/navigation_details.h" |
12 #include "content/public/browser/render_frame_host.h" | 12 #include "content/public/browser/render_frame_host.h" |
13 #include "content/public/browser/render_process_host.h" | 13 #include "content/public/browser/render_process_host.h" |
14 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
16 #include "content/public/common/page_zoom.h" | 16 #include "content/public/common/page_zoom.h" |
17 #include "content/public/common/url_constants.h" | 17 #include "content/public/common/url_constants.h" |
18 #include "extensions/browser/api/extensions_api_client.h" | 18 #include "extensions/browser/api/extensions_api_client.h" |
19 #include "extensions/browser/event_router.h" | 19 #include "extensions/browser/event_router.h" |
20 #include "extensions/browser/extension_registry.h" | 20 #include "extensions/browser/extension_registry.h" |
21 #include "extensions/browser/guest_view/app_view/app_view_guest.h" | 21 #include "extensions/browser/guest_view/app_view/app_view_guest.h" |
22 #include "extensions/browser/guest_view/extension_options/extension_options_gues
t.h" | 22 #include "extensions/browser/guest_view/extension_options/extension_options_gues
t.h" |
| 23 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" |
23 #include "extensions/browser/guest_view/guest_view_manager.h" | 24 #include "extensions/browser/guest_view/guest_view_manager.h" |
24 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues
t.h" | 25 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues
t.h" |
25 #include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h" | 26 #include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h" |
26 #include "extensions/browser/guest_view/web_view/web_view_guest.h" | 27 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
27 #include "extensions/browser/process_manager.h" | 28 #include "extensions/browser/process_manager.h" |
28 #include "extensions/browser/process_map.h" | 29 #include "extensions/browser/process_map.h" |
29 #include "extensions/common/extension_messages.h" | 30 #include "extensions/common/extension_messages.h" |
30 #include "extensions/common/features/feature.h" | 31 #include "extensions/common/features/feature.h" |
31 #include "extensions/common/features/feature_provider.h" | 32 #include "extensions/common/features/feature_provider.h" |
32 #include "extensions/common/guest_view/guest_view_constants.h" | 33 #include "extensions/common/guest_view/guest_view_constants.h" |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 // Chrome Apps do not have a ZoomController. | 737 // Chrome Apps do not have a ZoomController. |
737 if (!embedder_zoom_controller) | 738 if (!embedder_zoom_controller) |
738 return; | 739 return; |
739 embedder_zoom_controller->RemoveObserver(this); | 740 embedder_zoom_controller->RemoveObserver(this); |
740 } | 741 } |
741 | 742 |
742 // static | 743 // static |
743 void GuestViewBase::RegisterGuestViewTypes() { | 744 void GuestViewBase::RegisterGuestViewTypes() { |
744 AppViewGuest::Register(); | 745 AppViewGuest::Register(); |
745 ExtensionOptionsGuest::Register(); | 746 ExtensionOptionsGuest::Register(); |
| 747 ExtensionViewGuest::Register(); |
746 MimeHandlerViewGuest::Register(); | 748 MimeHandlerViewGuest::Register(); |
747 SurfaceWorkerGuest::Register(); | 749 SurfaceWorkerGuest::Register(); |
748 WebViewGuest::Register(); | 750 WebViewGuest::Register(); |
749 } | 751 } |
750 | 752 |
751 } // namespace extensions | 753 } // namespace extensions |
OLD | NEW |