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

Side by Side Diff: extensions/browser/guest_view/guest_view_message_filter.cc

Issue 1032553009: favor DCHECK_CURRENTLY_ON for better logs in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/guest_view_message_filter.h" 5 #include "extensions/browser/guest_view/guest_view_message_filter.h"
6 6
7 #include "content/public/browser/browser_thread.h" 7 #include "content/public/browser/browser_thread.h"
8 #include "content/public/browser/render_frame_host.h" 8 #include "content/public/browser/render_frame_host.h"
9 #include "content/public/browser/render_view_host.h" 9 #include "content/public/browser/render_view_host.h"
10 #include "extensions/browser/guest_view/guest_view_base.h" 10 #include "extensions/browser/guest_view/guest_view_base.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 IPC_MESSAGE_HANDLER(GuestViewHostMsg_ResizeGuest, OnResizeGuest) 63 IPC_MESSAGE_HANDLER(GuestViewHostMsg_ResizeGuest, OnResizeGuest)
64 IPC_MESSAGE_UNHANDLED(handled = false) 64 IPC_MESSAGE_UNHANDLED(handled = false)
65 IPC_END_MESSAGE_MAP() 65 IPC_END_MESSAGE_MAP()
66 return handled; 66 return handled;
67 } 67 }
68 68
69 void GuestViewMessageFilter::OnAttachGuest( 69 void GuestViewMessageFilter::OnAttachGuest(
70 int element_instance_id, 70 int element_instance_id,
71 int guest_instance_id, 71 int guest_instance_id,
72 const base::DictionaryValue& params) { 72 const base::DictionaryValue& params) {
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 73 DCHECK_CURRENTLY_ON(BrowserThread::UI);
74 auto manager = GuestViewManager::FromBrowserContext(browser_context_); 74 auto manager = GuestViewManager::FromBrowserContext(browser_context_);
75 if (!manager) 75 if (!manager)
76 return; 76 return;
77 77
78 manager->AttachGuest(render_process_id_, 78 manager->AttachGuest(render_process_id_,
79 element_instance_id, 79 element_instance_id,
80 guest_instance_id, 80 guest_instance_id,
81 params); 81 params);
82 } 82 }
83 83
84 void GuestViewMessageFilter::OnCreateMimeHandlerViewGuest( 84 void GuestViewMessageFilter::OnCreateMimeHandlerViewGuest(
85 int render_frame_id, 85 int render_frame_id,
86 const std::string& view_id, 86 const std::string& view_id,
87 int element_instance_id, 87 int element_instance_id,
88 const gfx::Size& element_size) { 88 const gfx::Size& element_size) {
89 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 89 DCHECK_CURRENTLY_ON(BrowserThread::UI);
90 auto manager = GuestViewManager::FromBrowserContext(browser_context_); 90 auto manager = GuestViewManager::FromBrowserContext(browser_context_);
91 if (!manager) 91 if (!manager)
92 return; 92 return;
93 93
94 auto rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id); 94 auto rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id);
95 auto embedder_web_contents = WebContents::FromRenderFrameHost(rfh); 95 auto embedder_web_contents = WebContents::FromRenderFrameHost(rfh);
96 if (!embedder_web_contents) 96 if (!embedder_web_contents)
97 return; 97 return;
98 98
99 GuestViewManager::WebContentsCreatedCallback callback = 99 GuestViewManager::WebContentsCreatedCallback callback =
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 manager->AttachGuest(embedder_render_process_id, 159 manager->AttachGuest(embedder_render_process_id,
160 element_instance_id, 160 element_instance_id,
161 guest_instance_id, 161 guest_instance_id,
162 attach_params); 162 attach_params);
163 163
164 rfh->Send( 164 rfh->Send(
165 new GuestViewMsg_CreateMimeHandlerViewGuestACK(element_instance_id)); 165 new GuestViewMsg_CreateMimeHandlerViewGuestACK(element_instance_id));
166 } 166 }
167 167
168 } // namespace extensions 168 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698