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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
« no previous file with comments | « extensions/browser/DEPS ('k') | extensions/browser/mojo/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 10 matching lines...) Expand all
21 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h" 21 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h"
22 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_cons tants.h" 22 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_cons tants.h"
23 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t_delegate.h" 23 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t_delegate.h"
24 #include "extensions/browser/process_manager.h" 24 #include "extensions/browser/process_manager.h"
25 #include "extensions/common/constants.h" 25 #include "extensions/common/constants.h"
26 #include "extensions/common/extension_messages.h" 26 #include "extensions/common/extension_messages.h"
27 #include "extensions/common/guest_view/extensions_guest_view_messages.h" 27 #include "extensions/common/guest_view/extensions_guest_view_messages.h"
28 #include "extensions/strings/grit/extensions_strings.h" 28 #include "extensions/strings/grit/extensions_strings.h"
29 #include "ipc/ipc_message_macros.h" 29 #include "ipc/ipc_message_macros.h"
30 #include "net/base/url_util.h" 30 #include "net/base/url_util.h"
31 #include "services/shell/public/cpp/interface_registry.h" 31 #include "services/service_manager/public/cpp/interface_registry.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(std::unique_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,
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 element_instance_id())); 249 element_instance_id()));
250 } 250 }
251 251
252 base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const { 252 base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const {
253 if (!stream_) 253 if (!stream_)
254 return base::WeakPtr<StreamContainer>(); 254 return base::WeakPtr<StreamContainer>();
255 return stream_->GetWeakPtr(); 255 return stream_->GetWeakPtr();
256 } 256 }
257 257
258 } // namespace extensions 258 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/DEPS ('k') | extensions/browser/mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698