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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 10804020: Introduce runtime.onSuspendCanceled() event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos call Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 6bbd86f635e54858d1ad958d5c744e65aed8d016..97089b490612407858e388abd1d0984ef3209736 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -555,41 +555,21 @@ void ExtensionSettingsHandler::HandleInspectMessage(const ListValue* args) {
CHECK(base::StringToInt(render_process_id_str, &render_process_id));
CHECK(base::StringToInt(render_view_id_str, &render_view_id));
- if (render_process_id == -1) {
Matt Perry 2012/07/24 19:25:15 This change is incorrect. The render view might no
- // This message is for a lazy background page. Start the page if necessary.
- const Extension* extension =
- extension_service_->extensions()->GetByID(extension_id);
- DCHECK(extension);
-
- Profile* profile = extension_service_->profile();
- if (incognito)
- profile = profile->GetOffTheRecordProfile();
-
- ExtensionProcessManager* pm = profile->GetExtensionProcessManager();
- extensions::LazyBackgroundTaskQueue* queue =
- extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue();
-
- ExtensionHost* host = pm->GetBackgroundHostForExtension(extension->id());
- if (host) {
- InspectExtensionHost(host);
- } else {
- queue->AddPendingTask(
- profile, extension->id(),
- base::Bind(&ExtensionSettingsHandler::InspectExtensionHost,
- base::Unretained(this)));
- }
+ const Extension* extension =
+ extension_service_->extensions()->GetByID(extension_id);
+ DCHECK(extension);
- return;
- }
+ Profile* profile = extension_service_->profile();
+ if (incognito)
+ profile = profile->GetOffTheRecordProfile();
- RenderViewHost* host = RenderViewHost::FromID(render_process_id,
- render_view_id);
- if (!host) {
- // This can happen if the host has gone away since the page was displayed.
- return;
- }
+ extensions::LazyBackgroundTaskQueue* queue =
+ extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue();
- DevToolsWindow::OpenDevToolsWindow(host);
+ queue->AddPendingTask(
+ profile, extension->id(),
+ base::Bind(&ExtensionSettingsHandler::InspectExtensionHost,
+ base::Unretained(this)));
}
void ExtensionSettingsHandler::HandleReloadMessage(const ListValue* args) {

Powered by Google App Engine
This is Rietveld 408576698