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

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

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Mac Build + GN Test builds Created 5 years, 8 months 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 "components/guest_view/browser/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/guest_view/browser/guest_view_event.h"
10 #include "components/guest_view/browser/guest_view_manager.h"
11 #include "components/guest_view/common/guest_view_constants.h"
12 #include "components/guest_view/common/guest_view_messages.h"
9 #include "components/ui/zoom/page_zoom.h" 13 #include "components/ui/zoom/page_zoom.h"
10 #include "components/ui/zoom/zoom_controller.h" 14 #include "components/ui/zoom/zoom_controller.h"
11 #include "content/public/browser/navigation_details.h" 15 #include "content/public/browser/navigation_details.h"
12 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/render_widget_host_view.h" 19 #include "content/public/browser/render_widget_host_view.h"
16 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
17 #include "content/public/common/page_zoom.h" 21 #include "content/public/common/page_zoom.h"
18 #include "content/public/common/url_constants.h" 22 #include "content/public/common/url_constants.h"
19 #include "extensions/browser/guest_view/guest_view_event.h"
20 #include "extensions/browser/guest_view/guest_view_manager.h"
21 #include "extensions/common/guest_view/guest_view_constants.h"
22 #include "extensions/common/guest_view/guest_view_messages.h"
23 #include "third_party/WebKit/public/web/WebInputEvent.h" 23 #include "third_party/WebKit/public/web/WebInputEvent.h"
24 24
25 using content::WebContents; 25 using content::WebContents;
26 26
27 namespace content { 27 namespace content {
28 struct FrameNavigateParams; 28 struct FrameNavigateParams;
29 } 29 }
30 30
31 namespace extensions { 31 namespace guestview {
32 32
33 namespace { 33 namespace {
34 34
35 using WebContentsGuestViewMap = std::map<const WebContents*, GuestViewBase*>; 35 using WebContentsGuestViewMap = std::map<const WebContents*, GuestViewBase*>;
36 static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map = 36 static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map =
37 LAZY_INSTANCE_INITIALIZER; 37 LAZY_INSTANCE_INITIALIZER;
38 38
39 } // namespace 39 } // namespace
40 40
41 SetSizeParams::SetSizeParams() { 41 SetSizeParams::SetSizeParams() {
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 return; 810 return;
811 811
812 auto embedder_zoom_controller = 812 auto embedder_zoom_controller =
813 ui_zoom::ZoomController::FromWebContents(owner_web_contents()); 813 ui_zoom::ZoomController::FromWebContents(owner_web_contents());
814 // Chrome Apps do not have a ZoomController. 814 // Chrome Apps do not have a ZoomController.
815 if (!embedder_zoom_controller) 815 if (!embedder_zoom_controller)
816 return; 816 return;
817 embedder_zoom_controller->RemoveObserver(this); 817 embedder_zoom_controller->RemoveObserver(this);
818 } 818 }
819 819
820 } // namespace extensions 820 } // namespace guestview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698