Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: extensions/browser/guest_view/guest_view_base.cc

Issue 820513002: Renamed WorkerFrame to SurfaceWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/zoom_controller.h" 9 #include "components/ui/zoom/zoom_controller.h"
10 #include "content/public/browser/navigation_details.h" 10 #include "content/public/browser/navigation_details.h"
11 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
13 #include "content/public/browser/render_view_host.h" 13 #include "content/public/browser/render_view_host.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/common/page_zoom.h" 15 #include "content/public/common/page_zoom.h"
16 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
17 #include "extensions/browser/api/extensions_api_client.h" 17 #include "extensions/browser/api/extensions_api_client.h"
18 #include "extensions/browser/event_router.h" 18 #include "extensions/browser/event_router.h"
19 #include "extensions/browser/extension_registry.h" 19 #include "extensions/browser/extension_registry.h"
20 #include "extensions/browser/guest_view/app_view/app_view_guest.h" 20 #include "extensions/browser/guest_view/app_view/app_view_guest.h"
21 #include "extensions/browser/guest_view/extension_options/extension_options_gues t.h" 21 #include "extensions/browser/guest_view/extension_options/extension_options_gues t.h"
22 #include "extensions/browser/guest_view/guest_view_manager.h" 22 #include "extensions/browser/guest_view/guest_view_manager.h"
23 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h" 23 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
24 #include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h"
24 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 25 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
25 #include "extensions/browser/guest_view/worker_frame/worker_frame_guest.h"
26 #include "extensions/browser/process_map.h" 26 #include "extensions/browser/process_map.h"
27 #include "extensions/common/extension_messages.h" 27 #include "extensions/common/extension_messages.h"
28 #include "extensions/common/features/feature.h" 28 #include "extensions/common/features/feature.h"
29 #include "extensions/common/features/feature_provider.h" 29 #include "extensions/common/features/feature_provider.h"
30 #include "extensions/common/guest_view/guest_view_constants.h" 30 #include "extensions/common/guest_view/guest_view_constants.h"
31 #include "third_party/WebKit/public/web/WebInputEvent.h" 31 #include "third_party/WebKit/public/web/WebInputEvent.h"
32 32
33 using content::WebContents; 33 using content::WebContents;
34 34
35 namespace content { 35 namespace content {
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 if (!zoom_controller) 581 if (!zoom_controller)
582 return; 582 return;
583 zoom_controller->RemoveObserver(this); 583 zoom_controller->RemoveObserver(this);
584 } 584 }
585 585
586 // static 586 // static
587 void GuestViewBase::RegisterGuestViewTypes() { 587 void GuestViewBase::RegisterGuestViewTypes() {
588 AppViewGuest::Register(); 588 AppViewGuest::Register();
589 ExtensionOptionsGuest::Register(); 589 ExtensionOptionsGuest::Register();
590 MimeHandlerViewGuest::Register(); 590 MimeHandlerViewGuest::Register();
591 SurfaceWorkerGuest::Register();
591 WebViewGuest::Register(); 592 WebViewGuest::Register();
592 WorkerFrameGuest::Register();
593 } 593 }
594 594
595 } // namespace extensions 595 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/BUILD.gn ('k') | extensions/browser/guest_view/surface_worker/surface_worker_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698