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

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

Issue 1254103002: New Task Manager - Phase 1.3.5: Implement Extension Task Providing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 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/error_console/error_console.h" 7 #include "chrome/browser/extensions/error_console/error_console.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/window_controller.h" 9 #include "chrome/browser/extensions/window_controller.h"
10 #include "chrome/browser/task_management/web_contents_tags.h"
10 #include "chrome/common/extensions/chrome_extension_messages.h" 11 #include "chrome/common/extensions/chrome_extension_messages.h"
11 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/render_frame_host.h" 13 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/render_process_host.h" 14 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/render_view_host.h" 15 #include "content/public/browser/render_view_host.h"
15 #include "extensions/browser/extension_registry.h" 16 #include "extensions/browser/extension_registry.h"
16 #include "extensions/browser/extension_system.h" 17 #include "extensions/browser/extension_system.h"
17 #include "extensions/common/extension_messages.h" 18 #include "extensions/common/extension_messages.h"
18 #include "extensions/common/extension_urls.h" 19 #include "extensions/common/extension_urls.h"
19 20
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 78 }
78 79
79 void ChromeExtensionWebContentsObserver::InitializeRenderFrame( 80 void ChromeExtensionWebContentsObserver::InitializeRenderFrame(
80 content::RenderFrameHost* render_frame_host) { 81 content::RenderFrameHost* render_frame_host) {
81 ExtensionWebContentsObserver::InitializeRenderFrame(render_frame_host); 82 ExtensionWebContentsObserver::InitializeRenderFrame(render_frame_host);
82 WindowController* controller = dispatcher()->GetExtensionWindowController(); 83 WindowController* controller = dispatcher()->GetExtensionWindowController();
83 if (controller) { 84 if (controller) {
84 render_frame_host->Send(new ExtensionMsg_UpdateBrowserWindowId( 85 render_frame_host->Send(new ExtensionMsg_UpdateBrowserWindowId(
85 render_frame_host->GetRoutingID(), controller->GetWindowId())); 86 render_frame_host->GetRoutingID(), controller->GetWindowId()));
86 } 87 }
88
89 const Extension* extension = GetExtensionFromFrame(render_frame_host);
90 if (extension) {
91 // Make the extension show up in the task manager.
92 task_management::WebContentsTags::CreateForExtension(web_contents(),
93 extension);
afakhry 2015/07/25 00:50:40 Man, there must be a better place to do the taggin
94 }
87 } 95 }
88 96
89 void ChromeExtensionWebContentsObserver::ReloadIfTerminated( 97 void ChromeExtensionWebContentsObserver::ReloadIfTerminated(
90 content::RenderViewHost* render_view_host) { 98 content::RenderViewHost* render_view_host) {
91 std::string extension_id = GetExtensionId(render_view_host); 99 std::string extension_id = GetExtensionId(render_view_host);
92 if (extension_id.empty()) 100 if (extension_id.empty())
93 return; 101 return;
94 102
95 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context()); 103 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
96 104
97 // Reload the extension if it has crashed. 105 // Reload the extension if it has crashed.
98 // TODO(yoz): This reload doesn't happen synchronously for unpacked 106 // TODO(yoz): This reload doesn't happen synchronously for unpacked
99 // extensions. It seems to be fast enough, but there is a race. 107 // extensions. It seems to be fast enough, but there is a race.
100 // We should delay loading until the extension has reloaded. 108 // We should delay loading until the extension has reloaded.
101 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { 109 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) {
102 ExtensionSystem::Get(browser_context())-> 110 ExtensionSystem::Get(browser_context())->
103 extension_service()->ReloadExtension(extension_id); 111 extension_service()->ReloadExtension(extension_id);
104 } 112 }
105 } 113 }
106 114
107 } // namespace extensions 115 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698