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

Side by Side Diff: extensions/browser/api/guest_view/guest_view_internal_api.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/api/guest_view/guest_view_internal_api.h" 5 #include "extensions/browser/api/guest_view/guest_view_internal_api.h"
6 6
7 #include "components/guest_view/browser/guest_view_base.h" 7 #include "components/guest_view/browser/guest_view_base.h"
8 #include "components/guest_view/browser/guest_view_manager.h" 8 #include "components/guest_view/browser/guest_view_manager.h"
9 #include "components/guest_view/browser/guest_view_manager_delegate.h" 9 #include "components/guest_view/browser/guest_view_manager_delegate.h"
10 #include "components/guest_view/common/guest_view_constants.h" 10 #include "components/guest_view/common/guest_view_constants.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( 67 void GuestViewInternalCreateGuestFunction::CreateGuestCallback(
68 content::WebContents* guest_web_contents) { 68 content::WebContents* guest_web_contents) {
69 int guest_instance_id = 0; 69 int guest_instance_id = 0;
70 int content_window_id = MSG_ROUTING_NONE; 70 int content_window_id = MSG_ROUTING_NONE;
71 if (guest_web_contents) { 71 if (guest_web_contents) {
72 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); 72 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);
73 guest_instance_id = guest->guest_instance_id(); 73 guest_instance_id = guest->guest_instance_id();
74 content_window_id = guest->proxy_routing_id(); 74 content_window_id = guest->proxy_routing_id();
75 } 75 }
76 scoped_ptr<base::DictionaryValue> return_params(new base::DictionaryValue()); 76 std::unique_ptr<base::DictionaryValue> return_params(
77 new base::DictionaryValue());
77 return_params->SetInteger(guest_view::kID, guest_instance_id); 78 return_params->SetInteger(guest_view::kID, guest_instance_id);
78 return_params->SetInteger(guest_view::kContentWindowID, content_window_id); 79 return_params->SetInteger(guest_view::kContentWindowID, content_window_id);
79 SetResult(return_params.release()); 80 SetResult(return_params.release());
80 SendResponse(true); 81 SendResponse(true);
81 } 82 }
82 83
83 GuestViewInternalDestroyGuestFunction:: 84 GuestViewInternalDestroyGuestFunction::
84 GuestViewInternalDestroyGuestFunction() { 85 GuestViewInternalDestroyGuestFunction() {
85 } 86 }
86 87
87 GuestViewInternalDestroyGuestFunction:: 88 GuestViewInternalDestroyGuestFunction::
88 ~GuestViewInternalDestroyGuestFunction() { 89 ~GuestViewInternalDestroyGuestFunction() {
89 } 90 }
90 91
91 bool GuestViewInternalDestroyGuestFunction::RunAsync() { 92 bool GuestViewInternalDestroyGuestFunction::RunAsync() {
92 scoped_ptr<guest_view_internal::DestroyGuest::Params> params( 93 std::unique_ptr<guest_view_internal::DestroyGuest::Params> params(
93 guest_view_internal::DestroyGuest::Params::Create(*args_)); 94 guest_view_internal::DestroyGuest::Params::Create(*args_));
94 EXTENSION_FUNCTION_VALIDATE(params.get()); 95 EXTENSION_FUNCTION_VALIDATE(params.get());
95 GuestViewBase* guest = GuestViewBase::From( 96 GuestViewBase* guest = GuestViewBase::From(
96 render_frame_host()->GetProcess()->GetID(), params->instance_id); 97 render_frame_host()->GetProcess()->GetID(), params->instance_id);
97 if (!guest) 98 if (!guest)
98 return false; 99 return false;
99 guest->Destroy(); 100 guest->Destroy();
100 SendResponse(true); 101 SendResponse(true);
101 return true; 102 return true;
102 } 103 }
103 104
104 GuestViewInternalSetSizeFunction::GuestViewInternalSetSizeFunction() { 105 GuestViewInternalSetSizeFunction::GuestViewInternalSetSizeFunction() {
105 } 106 }
106 107
107 GuestViewInternalSetSizeFunction::~GuestViewInternalSetSizeFunction() { 108 GuestViewInternalSetSizeFunction::~GuestViewInternalSetSizeFunction() {
108 } 109 }
109 110
110 bool GuestViewInternalSetSizeFunction::RunAsync() { 111 bool GuestViewInternalSetSizeFunction::RunAsync() {
111 scoped_ptr<guest_view_internal::SetSize::Params> params( 112 std::unique_ptr<guest_view_internal::SetSize::Params> params(
112 guest_view_internal::SetSize::Params::Create(*args_)); 113 guest_view_internal::SetSize::Params::Create(*args_));
113 EXTENSION_FUNCTION_VALIDATE(params.get()); 114 EXTENSION_FUNCTION_VALIDATE(params.get());
114 GuestViewBase* guest = GuestViewBase::From( 115 GuestViewBase* guest = GuestViewBase::From(
115 render_frame_host()->GetProcess()->GetID(), params->instance_id); 116 render_frame_host()->GetProcess()->GetID(), params->instance_id);
116 if (!guest) 117 if (!guest)
117 return false; 118 return false;
118 119
119 guest_view::SetSizeParams set_size_params; 120 guest_view::SetSizeParams set_size_params;
120 if (params->params.enable_auto_size) { 121 if (params->params.enable_auto_size) {
121 set_size_params.enable_auto_size.reset( 122 set_size_params.enable_auto_size.reset(
(...skipping 11 matching lines...) Expand all
133 set_size_params.normal_size.reset(new gfx::Size( 134 set_size_params.normal_size.reset(new gfx::Size(
134 params->params.normal->width, params->params.normal->height)); 135 params->params.normal->width, params->params.normal->height));
135 } 136 }
136 137
137 guest->SetSize(set_size_params); 138 guest->SetSize(set_size_params);
138 SendResponse(true); 139 SendResponse(true);
139 return true; 140 return true;
140 } 141 }
141 142
142 } // namespace extensions 143 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698