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

Side by Side Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc

Issue 1909773002: Convert //extensions/browser 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/guest_view/mime_handler_view/mime_handler_view_gues t.h" 5 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "components/guest_view/common/guest_view_constants.h" 10 #include "components/guest_view/common/guest_view_constants.h"
(...skipping 18 matching lines...) Expand all
29 #include "extensions/strings/grit/extensions_strings.h" 29 #include "extensions/strings/grit/extensions_strings.h"
30 #include "ipc/ipc_message_macros.h" 30 #include "ipc/ipc_message_macros.h"
31 #include "net/base/url_util.h" 31 #include "net/base/url_util.h"
32 #include "third_party/WebKit/public/web/WebInputEvent.h" 32 #include "third_party/WebKit/public/web/WebInputEvent.h"
33 33
34 using content::WebContents; 34 using content::WebContents;
35 using guest_view::GuestViewBase; 35 using guest_view::GuestViewBase;
36 36
37 namespace extensions { 37 namespace extensions {
38 38
39 StreamContainer::StreamContainer(scoped_ptr<content::StreamInfo> stream, 39 StreamContainer::StreamContainer(std::unique_ptr<content::StreamInfo> stream,
40 int tab_id, 40 int tab_id,
41 bool embedded, 41 bool embedded,
42 const GURL& handler_url, 42 const GURL& handler_url,
43 const std::string& extension_id) 43 const std::string& extension_id)
44 : stream_(std::move(stream)), 44 : stream_(std::move(stream)),
45 embedded_(embedded), 45 embedded_(embedded),
46 tab_id_(tab_id), 46 tab_id_(tab_id),
47 handler_url_(handler_url), 47 handler_url_(handler_url),
48 extension_id_(extension_id), 48 extension_id_(extension_id),
49 weak_factory_(this) { 49 weak_factory_(this) {
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 element_instance_id())); 235 element_instance_id()));
236 } 236 }
237 237
238 base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const { 238 base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const {
239 if (!stream_) 239 if (!stream_)
240 return base::WeakPtr<StreamContainer>(); 240 return base::WeakPtr<StreamContainer>();
241 return stream_->GetWeakPtr(); 241 return stream_->GetWeakPtr();
242 } 242 }
243 243
244 } // namespace extensions 244 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698