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/guest_view_constants.h" | 18 #include "extensions/browser/guest_view/guest_view_constants.h" |
18 #include "extensions/browser/guest_view/guest_view_manager.h" | 19 #include "extensions/browser/guest_view/guest_view_manager.h" |
| 20 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
19 #include "extensions/browser/process_map.h" | 21 #include "extensions/browser/process_map.h" |
20 #include "extensions/common/features/feature.h" | 22 #include "extensions/common/features/feature.h" |
21 #include "extensions/common/features/feature_provider.h" | 23 #include "extensions/common/features/feature_provider.h" |
22 #include "third_party/WebKit/public/web/WebInputEvent.h" | 24 #include "third_party/WebKit/public/web/WebInputEvent.h" |
23 | 25 |
24 using content::WebContents; | 26 using content::WebContents; |
25 | 27 |
26 namespace extensions { | 28 namespace extensions { |
27 | 29 |
28 namespace { | 30 namespace { |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 return; | 437 return; |
436 } | 438 } |
437 InitWithWebContents(embedder_extension_id, | 439 InitWithWebContents(embedder_extension_id, |
438 embedder_render_process_id, | 440 embedder_render_process_id, |
439 guest_web_contents); | 441 guest_web_contents); |
440 callback.Run(guest_web_contents); | 442 callback.Run(guest_web_contents); |
441 } | 443 } |
442 | 444 |
443 // static | 445 // static |
444 void GuestViewBase::RegisterGuestViewTypes() { | 446 void GuestViewBase::RegisterGuestViewTypes() { |
| 447 AppViewGuest::Register(); |
| 448 WebViewGuest::Register(); |
445 ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); | 449 ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); |
446 } | 450 } |
447 | 451 |
448 } // namespace extensions | 452 } // namespace extensions |
OLD | NEW |