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

Side by Side Diff: chrome/browser/extensions/chrome_extension_web_contents_observer.cc

Issue 321453003: Mark ChromeViewHostMsg_DetailedConsoleMessageAdded as extensions-only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/tab_helper.cc » ('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 "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 5 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
6 6
7 #include "chrome/browser/extensions/api/messaging/message_service.h" 7 #include "chrome/browser/extensions/api/messaging/message_service.h"
8 #include "chrome/browser/extensions/error_console/error_console.h" 8 #include "chrome/browser/extensions/error_console/error_console.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message) 42 IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
43 IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnPostMessage) 43 IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnPostMessage)
44 IPC_MESSAGE_UNHANDLED(handled = false) 44 IPC_MESSAGE_UNHANDLED(handled = false)
45 IPC_END_MESSAGE_MAP() 45 IPC_END_MESSAGE_MAP()
46 return handled; 46 return handled;
47 } 47 }
48 48
49 bool ChromeExtensionWebContentsObserver::OnMessageReceived( 49 bool ChromeExtensionWebContentsObserver::OnMessageReceived(
50 const IPC::Message& message, 50 const IPC::Message& message,
51 content::RenderFrameHost* render_frame_host) { 51 content::RenderFrameHost* render_frame_host) {
52 #if defined(ENABLE_EXTENSIONS)
52 bool handled = true; 53 bool handled = true;
53 IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message) 54 IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
54 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded, 55 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
55 OnDetailedConsoleMessageAdded) 56 OnDetailedConsoleMessageAdded)
56 IPC_MESSAGE_UNHANDLED(handled = false) 57 IPC_MESSAGE_UNHANDLED(handled = false)
57 IPC_END_MESSAGE_MAP() 58 IPC_END_MESSAGE_MAP()
59 #else
60 bool handled = false;
61 #endif
58 return handled; 62 return handled;
59 } 63 }
60 64
61 void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded( 65 void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
62 const base::string16& message, 66 const base::string16& message,
63 const base::string16& source, 67 const base::string16& source,
64 const StackTrace& stack_trace, 68 const StackTrace& stack_trace,
65 int32 severity_level) { 69 int32 severity_level) {
70 #if defined(ENABLE_EXTENSIONS)
66 if (!IsSourceFromAnExtension(source)) 71 if (!IsSourceFromAnExtension(source))
67 return; 72 return;
68 73
69 content::RenderViewHost* render_view_host = 74 content::RenderViewHost* render_view_host =
70 web_contents()->GetRenderViewHost(); 75 web_contents()->GetRenderViewHost();
71 std::string extension_id = GetExtensionId(render_view_host); 76 std::string extension_id = GetExtensionId(render_view_host);
72 if (extension_id.empty()) 77 if (extension_id.empty())
73 extension_id = GURL(source).host(); 78 extension_id = GURL(source).host();
74 79
75 ExtensionSystem::Get(browser_context())->error_console()->ReportError( 80 ExtensionSystem::Get(browser_context())->error_console()->ReportError(
76 scoped_ptr<ExtensionError>( 81 scoped_ptr<ExtensionError>(
77 new RuntimeError(extension_id, 82 new RuntimeError(extension_id,
78 browser_context()->IsOffTheRecord(), 83 browser_context()->IsOffTheRecord(),
79 source, 84 source,
80 message, 85 message,
81 stack_trace, 86 stack_trace,
82 web_contents()->GetLastCommittedURL(), 87 web_contents()->GetLastCommittedURL(),
83 static_cast<logging::LogSeverity>(severity_level), 88 static_cast<logging::LogSeverity>(severity_level),
84 render_view_host->GetRoutingID(), 89 render_view_host->GetRoutingID(),
85 render_view_host->GetProcess()->GetID()))); 90 render_view_host->GetProcess()->GetID())));
91 #endif
86 } 92 }
87 93
88 void ChromeExtensionWebContentsObserver::OnPostMessage(int port_id, 94 void ChromeExtensionWebContentsObserver::OnPostMessage(int port_id,
89 const Message& message) { 95 const Message& message) {
90 MessageService* message_service = MessageService::Get(browser_context()); 96 MessageService* message_service = MessageService::Get(browser_context());
91 if (message_service) { 97 if (message_service) {
92 message_service->PostMessage(port_id, message); 98 message_service->PostMessage(port_id, message);
93 } 99 }
94 } 100 }
95 101
96 void ChromeExtensionWebContentsObserver::ReloadIfTerminated( 102 void ChromeExtensionWebContentsObserver::ReloadIfTerminated(
97 content::RenderViewHost* render_view_host) { 103 content::RenderViewHost* render_view_host) {
98 std::string extension_id = GetExtensionId(render_view_host); 104 std::string extension_id = GetExtensionId(render_view_host);
99 if (extension_id.empty()) 105 if (extension_id.empty())
100 return; 106 return;
101 107
102 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context()); 108 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
103 109
104 // Reload the extension if it has crashed. 110 // Reload the extension if it has crashed.
105 // TODO(yoz): This reload doesn't happen synchronously for unpacked 111 // TODO(yoz): This reload doesn't happen synchronously for unpacked
106 // extensions. It seems to be fast enough, but there is a race. 112 // extensions. It seems to be fast enough, but there is a race.
107 // We should delay loading until the extension has reloaded. 113 // We should delay loading until the extension has reloaded.
108 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { 114 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) {
109 ExtensionSystem::Get(browser_context())-> 115 ExtensionSystem::Get(browser_context())->
110 extension_service()->ReloadExtension(extension_id); 116 extension_service()->ReloadExtension(extension_id);
111 } 117 }
112 } 118 }
113 119
114 } // namespace extensions 120 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698