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 "components/guest_view/browser/guest_view_manager.h" | 5 #include "components/guest_view/browser/guest_view_manager.h" |
6 | 6 |
7 #include <tuple> | 7 #include <tuple> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" |
11 #include "base/metrics/user_metrics.h" | 12 #include "base/metrics/user_metrics.h" |
12 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
13 #include "components/guest_view/browser/guest_view_base.h" | 14 #include "components/guest_view/browser/guest_view_base.h" |
14 #include "components/guest_view/browser/guest_view_manager_delegate.h" | 15 #include "components/guest_view/browser/guest_view_manager_delegate.h" |
15 #include "components/guest_view/browser/guest_view_manager_factory.h" | 16 #include "components/guest_view/browser/guest_view_manager_factory.h" |
16 #include "components/guest_view/common/guest_view_constants.h" | 17 #include "components/guest_view/common/guest_view_constants.h" |
17 #include "content/public/browser/browser_context.h" | 18 #include "content/public/browser/browser_context.h" |
18 #include "content/public/browser/render_frame_host.h" | 19 #include "content/public/browser/render_frame_host.h" |
19 #include "content/public/browser/render_process_host.h" | 20 #include "content/public/browser/render_process_host.h" |
20 #include "content/public/browser/render_view_host.h" | 21 #include "content/public/browser/render_view_host.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 BrowserContext* context, | 81 BrowserContext* context, |
81 std::unique_ptr<GuestViewManagerDelegate> delegate) { | 82 std::unique_ptr<GuestViewManagerDelegate> delegate) { |
82 GuestViewManager* guest_manager = FromBrowserContext(context); | 83 GuestViewManager* guest_manager = FromBrowserContext(context); |
83 if (!guest_manager) { | 84 if (!guest_manager) { |
84 if (factory_) { | 85 if (factory_) { |
85 guest_manager = | 86 guest_manager = |
86 factory_->CreateGuestViewManager(context, std::move(delegate)); | 87 factory_->CreateGuestViewManager(context, std::move(delegate)); |
87 } else { | 88 } else { |
88 guest_manager = new GuestViewManager(context, std::move(delegate)); | 89 guest_manager = new GuestViewManager(context, std::move(delegate)); |
89 } | 90 } |
90 context->SetUserData(kGuestViewManagerKeyName, guest_manager); | 91 context->SetUserData(kGuestViewManagerKeyName, |
| 92 base::WrapUnique(guest_manager)); |
91 } | 93 } |
92 return guest_manager; | 94 return guest_manager; |
93 } | 95 } |
94 | 96 |
95 // static | 97 // static |
96 GuestViewManager* GuestViewManager::FromBrowserContext( | 98 GuestViewManager* GuestViewManager::FromBrowserContext( |
97 BrowserContext* context) { | 99 BrowserContext* context) { |
98 return static_cast<GuestViewManager*>(context->GetUserData( | 100 return static_cast<GuestViewManager*>(context->GetUserData( |
99 kGuestViewManagerKeyName)); | 101 kGuestViewManagerKeyName)); |
100 } | 102 } |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 const GuestViewCreateFunction& create_function, | 504 const GuestViewCreateFunction& create_function, |
503 const GuestViewCleanUpFunction& cleanup_function) | 505 const GuestViewCleanUpFunction& cleanup_function) |
504 : create_function(create_function), cleanup_function(cleanup_function) {} | 506 : create_function(create_function), cleanup_function(cleanup_function) {} |
505 | 507 |
506 GuestViewManager::GuestViewData::GuestViewData(const GuestViewData& other) = | 508 GuestViewManager::GuestViewData::GuestViewData(const GuestViewData& other) = |
507 default; | 509 default; |
508 | 510 |
509 GuestViewManager::GuestViewData::~GuestViewData() {} | 511 GuestViewManager::GuestViewData::~GuestViewData() {} |
510 | 512 |
511 } // namespace guest_view | 513 } // namespace guest_view |
OLD | NEW |