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 "chrome/browser/guest_view/guest_view_base.h" | 5 #include "chrome/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 "chrome/browser/guest_view/app_view/app_view_guest.h" | 9 #include "chrome/browser/guest_view/app_view/app_view_guest.h" |
| 10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" |
10 #include "chrome/browser/guest_view/guest_view_constants.h" | 11 #include "chrome/browser/guest_view/guest_view_constants.h" |
11 #include "chrome/browser/guest_view/guest_view_manager.h" | 12 #include "chrome/browser/guest_view/guest_view_manager.h" |
12 #include "chrome/browser/guest_view/web_view/web_view_guest.h" | 13 #include "chrome/browser/guest_view/web_view/web_view_guest.h" |
13 #include "chrome/common/content_settings.h" | 14 #include "chrome/common/content_settings.h" |
14 #include "content/public/browser/render_frame_host.h" | 15 #include "content/public/browser/render_frame_host.h" |
15 #include "content/public/browser/render_process_host.h" | 16 #include "content/public/browser/render_process_host.h" |
16 #include "content/public/browser/render_view_host.h" | 17 #include "content/public/browser/render_view_host.h" |
17 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
18 #include "content/public/common/url_constants.h" | 19 #include "content/public/common/url_constants.h" |
19 #include "extensions/browser/event_router.h" | 20 #include "extensions/browser/event_router.h" |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 } | 381 } |
381 InitWithWebContents(embedder_extension_id, | 382 InitWithWebContents(embedder_extension_id, |
382 embedder_render_process_id, | 383 embedder_render_process_id, |
383 guest_web_contents); | 384 guest_web_contents); |
384 callback.Run(guest_web_contents); | 385 callback.Run(guest_web_contents); |
385 } | 386 } |
386 | 387 |
387 // static | 388 // static |
388 void GuestViewBase::RegisterGuestViewTypes() { | 389 void GuestViewBase::RegisterGuestViewTypes() { |
389 AppViewGuest::Register(); | 390 AppViewGuest::Register(); |
| 391 ExtensionOptionsGuest::Register(); |
390 WebViewGuest::Register(); | 392 WebViewGuest::Register(); |
391 } | 393 } |
OLD | NEW |