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

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

Issue 23007021: Report Javascript Runtime Errors to the Error Console (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_feldman
Patch Set: Created 7 years, 3 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 | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/extensions/tab_helper.h » ('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 (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/extension_host.h" 5 #include "chrome/browser/extensions/extension_host.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h"
10 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/browser_shutdown.h" 17 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/extensions/error_console/error_console.h"
18 #include "chrome/browser/extensions/event_router.h" 20 #include "chrome/browser/extensions/event_router.h"
19 #include "chrome/browser/extensions/extension_process_manager.h" 21 #include "chrome/browser/extensions/extension_process_manager.h"
20 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
21 #include "chrome/browser/extensions/extension_system.h" 23 #include "chrome/browser/extensions/extension_system.h"
22 #include "chrome/browser/extensions/extension_tab_util.h" 24 #include "chrome/browser/extensions/extension_tab_util.h"
23 #include "chrome/browser/extensions/window_controller.h" 25 #include "chrome/browser/extensions/window_controller.h"
24 #include "chrome/browser/file_select_helper.h" 26 #include "chrome/browser/file_select_helper.h"
25 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 27 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
26 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 29 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
(...skipping 13 matching lines...) Expand all
41 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
42 #include "content/public/browser/content_browser_client.h" 44 #include "content/public/browser/content_browser_client.h"
43 #include "content/public/browser/native_web_keyboard_event.h" 45 #include "content/public/browser/native_web_keyboard_event.h"
44 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/render_process_host.h" 47 #include "content/public/browser/render_process_host.h"
46 #include "content/public/browser/render_view_host.h" 48 #include "content/public/browser/render_view_host.h"
47 #include "content/public/browser/render_widget_host_view.h" 49 #include "content/public/browser/render_widget_host_view.h"
48 #include "content/public/browser/site_instance.h" 50 #include "content/public/browser/site_instance.h"
49 #include "content/public/browser/web_contents.h" 51 #include "content/public/browser/web_contents.h"
50 #include "content/public/browser/web_contents_view.h" 52 #include "content/public/browser/web_contents_view.h"
53 #include "extensions/browser/extension_error.h"
51 #include "extensions/browser/view_type_utils.h" 54 #include "extensions/browser/view_type_utils.h"
55 #include "extensions/common/extension_urls.h"
52 #include "grit/browser_resources.h" 56 #include "grit/browser_resources.h"
53 #include "grit/chromium_strings.h" 57 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
55 #include "ui/base/keycodes/keyboard_codes.h" 59 #include "ui/base/keycodes/keyboard_codes.h"
56 #include "ui/base/l10n/l10n_util.h" 60 #include "ui/base/l10n/l10n_util.h"
57 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
58 62
59 #if !defined(OS_ANDROID) 63 #if !defined(OS_ANDROID)
60 #include "components/web_modal/web_contents_modal_dialog_manager.h" 64 #include "components/web_modal/web_contents_modal_dialog_manager.h"
61 #endif 65 #endif
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 536
533 bool ExtensionHost::OnMessageReceived(const IPC::Message& message) { 537 bool ExtensionHost::OnMessageReceived(const IPC::Message& message) {
534 bool handled = true; 538 bool handled = true;
535 IPC_BEGIN_MESSAGE_MAP(ExtensionHost, message) 539 IPC_BEGIN_MESSAGE_MAP(ExtensionHost, message)
536 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) 540 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
537 IPC_MESSAGE_HANDLER(ExtensionHostMsg_EventAck, OnEventAck) 541 IPC_MESSAGE_HANDLER(ExtensionHostMsg_EventAck, OnEventAck)
538 IPC_MESSAGE_HANDLER(ExtensionHostMsg_IncrementLazyKeepaliveCount, 542 IPC_MESSAGE_HANDLER(ExtensionHostMsg_IncrementLazyKeepaliveCount,
539 OnIncrementLazyKeepaliveCount) 543 OnIncrementLazyKeepaliveCount)
540 IPC_MESSAGE_HANDLER(ExtensionHostMsg_DecrementLazyKeepaliveCount, 544 IPC_MESSAGE_HANDLER(ExtensionHostMsg_DecrementLazyKeepaliveCount,
541 OnDecrementLazyKeepaliveCount) 545 OnDecrementLazyKeepaliveCount)
546 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
547 OnDetailedConsoleMessageAdded)
542 IPC_MESSAGE_UNHANDLED(handled = false) 548 IPC_MESSAGE_UNHANDLED(handled = false)
543 IPC_END_MESSAGE_MAP() 549 IPC_END_MESSAGE_MAP()
544 return handled; 550 return handled;
545 } 551 }
546 552
547 void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) { 553 void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) {
548 extension_function_dispatcher_.Dispatch(params, render_view_host()); 554 extension_function_dispatcher_.Dispatch(params, render_view_host());
549 } 555 }
550 556
551 void ExtensionHost::OnEventAck() { 557 void ExtensionHost::OnEventAck() {
552 EventRouter* router = ExtensionSystem::Get(profile_)->event_router(); 558 EventRouter* router = ExtensionSystem::Get(profile_)->event_router();
553 if (router) 559 if (router)
554 router->OnEventAck(profile_, extension_id()); 560 router->OnEventAck(profile_, extension_id());
555 } 561 }
556 562
557 void ExtensionHost::OnIncrementLazyKeepaliveCount() { 563 void ExtensionHost::OnIncrementLazyKeepaliveCount() {
558 ExtensionProcessManager* pm = 564 ExtensionProcessManager* pm =
559 ExtensionSystem::Get(profile_)->process_manager(); 565 ExtensionSystem::Get(profile_)->process_manager();
560 if (pm) 566 if (pm)
561 pm->IncrementLazyKeepaliveCount(extension()); 567 pm->IncrementLazyKeepaliveCount(extension());
562 } 568 }
563 569
564 void ExtensionHost::OnDecrementLazyKeepaliveCount() { 570 void ExtensionHost::OnDecrementLazyKeepaliveCount() {
565 ExtensionProcessManager* pm = 571 ExtensionProcessManager* pm =
566 ExtensionSystem::Get(profile_)->process_manager(); 572 ExtensionSystem::Get(profile_)->process_manager();
567 if (pm) 573 if (pm)
568 pm->DecrementLazyKeepaliveCount(extension()); 574 pm->DecrementLazyKeepaliveCount(extension());
569 } 575 }
570 576
577 void ExtensionHost::OnDetailedConsoleMessageAdded(
578 const base::string16& message,
579 const base::string16& source,
580 const StackTrace& stack_trace,
581 int32 severity_level) {
582 if (IsSourceFromAnExtension(source)) {
583 ErrorConsole::Get(profile_)->ReportError(
584 scoped_ptr<ExtensionError>(new RuntimeError(
585 profile_->IsOffTheRecord(),
586 source,
587 message,
588 stack_trace,
589 associated_web_contents_ ?
590 associated_web_contents_->GetLastCommittedURL() :
591 GURL::EmptyGURL(),
592 static_cast<logging::LogSeverity>(severity_level))));
593 }
594 }
595
571 void ExtensionHost::UnhandledKeyboardEvent( 596 void ExtensionHost::UnhandledKeyboardEvent(
572 WebContents* source, 597 WebContents* source,
573 const content::NativeWebKeyboardEvent& event) { 598 const content::NativeWebKeyboardEvent& event) {
574 Browser* browser = view() ? view()->browser() : NULL; 599 Browser* browser = view() ? view()->browser() : NULL;
575 if (browser) { 600 if (browser) {
576 // Handle lower priority browser shortcuts such as Ctrl-f. 601 // Handle lower priority browser shortcuts such as Ctrl-f.
577 return browser->HandleKeyboardEvent(source, event); 602 return browser->HandleKeyboardEvent(source, event);
578 } else { 603 } else {
579 #if defined(TOOLKIT_VIEWS) 604 #if defined(TOOLKIT_VIEWS)
580 // In case there's no Browser (e.g. for dialogs), pass it to 605 // In case there's no Browser (e.g. for dialogs), pass it to
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 694
670 void ExtensionHost::RequestMediaAccessPermission( 695 void ExtensionHost::RequestMediaAccessPermission(
671 content::WebContents* web_contents, 696 content::WebContents* web_contents,
672 const content::MediaStreamRequest& request, 697 const content::MediaStreamRequest& request,
673 const content::MediaResponseCallback& callback) { 698 const content::MediaResponseCallback& callback) {
674 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( 699 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
675 web_contents, request, callback, extension()); 700 web_contents, request, callback, extension());
676 } 701 }
677 702
678 } // namespace extensions 703 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/extensions/tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698