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 "content/public/browser/render_frame_host.h" | 9 #include "content/public/browser/render_frame_host.h" |
10 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
11 #include "content/public/browser/render_view_host.h" | 11 #include "content/public/browser/render_view_host.h" |
12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
13 #include "content/public/common/url_constants.h" | 13 #include "content/public/common/url_constants.h" |
14 #include "extensions/browser/api/extensions_api_client.h" | 14 #include "extensions/browser/api/extensions_api_client.h" |
15 #include "extensions/browser/event_router.h" | 15 #include "extensions/browser/event_router.h" |
16 #include "extensions/browser/extension_registry.h" | 16 #include "extensions/browser/extension_registry.h" |
17 #include "extensions/browser/guest_view/app_view/app_view_guest.h" | 17 #include "extensions/browser/guest_view/app_view/app_view_guest.h" |
| 18 #include "extensions/browser/guest_view/extension_options/extension_options_gues
t.h" |
18 #include "extensions/browser/guest_view/guest_view_constants.h" | 19 #include "extensions/browser/guest_view/guest_view_constants.h" |
19 #include "extensions/browser/guest_view/guest_view_manager.h" | 20 #include "extensions/browser/guest_view/guest_view_manager.h" |
20 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues
t.h" | 21 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues
t.h" |
21 #include "extensions/browser/guest_view/web_view/web_view_guest.h" | 22 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
22 #include "extensions/browser/process_map.h" | 23 #include "extensions/browser/process_map.h" |
23 #include "extensions/common/features/feature.h" | 24 #include "extensions/common/features/feature.h" |
24 #include "extensions/common/features/feature_provider.h" | 25 #include "extensions/common/features/feature_provider.h" |
25 #include "third_party/WebKit/public/web/WebInputEvent.h" | 26 #include "third_party/WebKit/public/web/WebInputEvent.h" |
26 | 27 |
27 using content::WebContents; | 28 using content::WebContents; |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 } | 454 } |
454 InitWithWebContents(embedder_extension_id, | 455 InitWithWebContents(embedder_extension_id, |
455 embedder_render_process_id, | 456 embedder_render_process_id, |
456 guest_web_contents); | 457 guest_web_contents); |
457 callback.Run(guest_web_contents); | 458 callback.Run(guest_web_contents); |
458 } | 459 } |
459 | 460 |
460 // static | 461 // static |
461 void GuestViewBase::RegisterGuestViewTypes() { | 462 void GuestViewBase::RegisterGuestViewTypes() { |
462 AppViewGuest::Register(); | 463 AppViewGuest::Register(); |
| 464 ExtensionOptionsGuest::Register(); |
463 MimeHandlerViewGuest::Register(); | 465 MimeHandlerViewGuest::Register(); |
464 WebViewGuest::Register(); | 466 WebViewGuest::Register(); |
465 ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); | |
466 } | 467 } |
467 | 468 |
468 } // namespace extensions | 469 } // namespace extensions |
OLD | NEW |