OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/message_handler.h" | 5 #include "chrome/browser/extensions/message_handler.h" |
6 | 6 |
| 7 #include "base/values.h" |
7 #include "chrome/browser/extensions/api/messaging/message_service.h" | 8 #include "chrome/browser/extensions/api/messaging/message_service.h" |
8 #include "chrome/browser/extensions/extension_system.h" | 9 #include "chrome/browser/extensions/extension_system.h" |
9 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/common/extensions/extension_messages.h" | 11 #include "chrome/common/extensions/extension_messages.h" |
11 #include "content/public/browser/render_process_host.h" | 12 #include "content/public/browser/render_process_host.h" |
12 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
13 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
14 #include "extensions/browser/view_type_utils.h" | 15 #include "extensions/browser/view_type_utils.h" |
15 | 16 |
16 using content::WebContents; | 17 using content::WebContents; |
(...skipping 19 matching lines...) Expand all Loading... |
36 } | 37 } |
37 | 38 |
38 void MessageHandler::RenderViewHostInitialized() { | 39 void MessageHandler::RenderViewHostInitialized() { |
39 WebContents* web_contents = | 40 WebContents* web_contents = |
40 WebContents::FromRenderViewHost(render_view_host()); | 41 WebContents::FromRenderViewHost(render_view_host()); |
41 Send(new ExtensionMsg_NotifyRenderViewType( | 42 Send(new ExtensionMsg_NotifyRenderViewType( |
42 routing_id(), extensions::GetViewType(web_contents))); | 43 routing_id(), extensions::GetViewType(web_contents))); |
43 } | 44 } |
44 | 45 |
45 void MessageHandler::OnPostMessage(int port_id, | 46 void MessageHandler::OnPostMessage(int port_id, |
46 const std::string& message) { | 47 const base::ListValue& message) { |
47 Profile* profile = Profile::FromBrowserContext( | 48 Profile* profile = Profile::FromBrowserContext( |
48 render_view_host()->GetProcess()->GetBrowserContext()); | 49 render_view_host()->GetProcess()->GetBrowserContext()); |
49 MessageService* message_service = MessageService::Get(profile); | 50 MessageService* message_service = MessageService::Get(profile); |
50 if (message_service) { | 51 if (message_service) { |
51 message_service->PostMessage(port_id, message); | 52 message_service->PostMessage(port_id, make_scoped_ptr(message.DeepCopy())); |
52 } | 53 } |
53 } | 54 } |
54 | 55 |
55 } // namespace extensions | 56 } // namespace extensions |
OLD | NEW |