Index: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc |
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc |
index aee7d72a82246b8759a01491bb834d52e2b1d20e..841ed985181bd16b684eeb104b79c13d3b5571ea 100644 |
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc |
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc |
@@ -79,13 +79,12 @@ MimeHandlerViewGuest::MimeHandlerViewGuest(WebContents* owner_web_contents) |
MimeHandlerViewGuest::~MimeHandlerViewGuest() { |
} |
-const char* MimeHandlerViewGuest::GetAPINamespace() const { |
- return "mimeHandlerViewGuestInternal"; |
+base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const { |
+ if (!stream_) |
+ return base::WeakPtr<StreamContainer>(); |
+ return stream_->GetWeakPtr(); |
} |
-int MimeHandlerViewGuest::GetTaskPrefix() const { |
- return IDS_EXTENSION_TASK_MANAGER_MIMEHANDLERVIEW_TAG_PREFIX; |
-} |
void MimeHandlerViewGuest::CreateWebContents( |
const base::DictionaryValue& create_params, |
@@ -142,6 +141,14 @@ void MimeHandlerViewGuest::DidAttachToEmbedder() { |
base::Bind(&MimeHandlerServiceImpl::Create, stream_->GetWeakPtr())); |
} |
+const char* MimeHandlerViewGuest::GetAPINamespace() const { |
+ return "mimeHandlerViewGuestInternal"; |
+} |
+ |
+int MimeHandlerViewGuest::GetTaskPrefix() const { |
+ return IDS_EXTENSION_TASK_MANAGER_MIMEHANDLERVIEW_TAG_PREFIX; |
+} |
+ |
void MimeHandlerViewGuest::DidInitialize( |
const base::DictionaryValue& create_params) { |
ExtensionsAPIClient::Get()->AttachWebContentsHelpers(web_contents()); |
@@ -206,10 +213,4 @@ void MimeHandlerViewGuest::DocumentOnLoadCompletedInMainFrame() { |
element_instance_id())); |
} |
-base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const { |
- if (!stream_) |
- return base::WeakPtr<StreamContainer>(); |
- return stream_->GetWeakPtr(); |
-} |
- |
} // namespace extensions |