Chromium Code Reviews| 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 "components/ui/zoom/page_zoom.h" | 9 #include "components/ui/zoom/page_zoom.h" |
| 10 #include "components/ui/zoom/zoom_controller.h" | 10 #include "components/ui/zoom/zoom_controller.h" |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 218 GuestViewManager::FromBrowserContext(browser_context_)-> | 218 GuestViewManager::FromBrowserContext(browser_context_)-> |
| 219 AddGuest(guest_instance_id_, guest_web_contents); | 219 AddGuest(guest_instance_id_, guest_web_contents); |
| 220 | 220 |
| 221 // Create a ZoomController to allow the guest's contents to be zoomed. | 221 // Create a ZoomController to allow the guest's contents to be zoomed. |
| 222 ui_zoom::ZoomController::CreateForWebContents(guest_web_contents); | 222 ui_zoom::ZoomController::CreateForWebContents(guest_web_contents); |
| 223 | 223 |
| 224 // Populate the view instance ID if we have it on creation. | 224 // Populate the view instance ID if we have it on creation. |
| 225 create_params.GetInteger(guestview::kParameterInstanceId, | 225 create_params.GetInteger(guestview::kParameterInstanceId, |
| 226 &view_instance_id_); | 226 &view_instance_id_); |
| 227 | 227 |
| 228 if (CanRunInDetachedState()) | 228 //if (CanRunInDetachedState()) |
|
Fady Samuel
2015/03/04 20:44:47
This makes me sad.
| |
| 229 SetUpSizing(create_params); | 229 // SetUpSizing(create_params); |
| 230 | 230 |
| 231 // Give the derived class an opportunity to perform additional initialization. | 231 // Give the derived class an opportunity to perform additional initialization. |
| 232 DidInitialize(create_params); | 232 DidInitialize(create_params); |
| 233 } | 233 } |
| 234 | 234 |
| 235 void GuestViewBase::DispatchOnResizeEvent(const gfx::Size& old_size, | 235 void GuestViewBase::DispatchOnResizeEvent(const gfx::Size& old_size, |
| 236 const gfx::Size& new_size) { | 236 const gfx::Size& new_size) { |
| 237 if (new_size == old_size) | 237 if (new_size == old_size) |
| 238 return; | 238 return; |
| 239 | 239 |
| (...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 811 void GuestViewBase::RegisterGuestViewTypes() { | 811 void GuestViewBase::RegisterGuestViewTypes() { |
| 812 AppViewGuest::Register(); | 812 AppViewGuest::Register(); |
| 813 ExtensionOptionsGuest::Register(); | 813 ExtensionOptionsGuest::Register(); |
| 814 ExtensionViewGuest::Register(); | 814 ExtensionViewGuest::Register(); |
| 815 MimeHandlerViewGuest::Register(); | 815 MimeHandlerViewGuest::Register(); |
| 816 SurfaceWorkerGuest::Register(); | 816 SurfaceWorkerGuest::Register(); |
| 817 WebViewGuest::Register(); | 817 WebViewGuest::Register(); |
| 818 } | 818 } |
| 819 | 819 |
| 820 } // namespace extensions | 820 } // namespace extensions |
| OLD | NEW |