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

Unified Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 23535002: Fixed case where _generated_background_page.html was still showing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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/extensions/api/developer_private/developer_private_api.cc
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index e1fd58b5d5e756132f0b5e51386fb5bd6e950a21..92d2b9d8101decccbe5d7e119b34bc7e5faccbac 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -343,8 +343,11 @@ scoped_ptr<developer::ItemInfo>
void DeveloperPrivateGetItemsInfoFunction::
GetInspectablePagesForExtensionProcess(
+ const Extension* extension,
const std::set<content::RenderViewHost*>& views,
ItemInspectViewList* result) {
+ bool has_generated_background_page =
+ BackgroundInfo::HasGeneratedBackgroundPage(extension);
for (std::set<content::RenderViewHost*>::const_iterator iter = views.begin();
iter != views.end(); ++iter) {
content::RenderViewHost* host = *iter;
@@ -356,12 +359,14 @@ void DeveloperPrivateGetItemsInfoFunction::
continue;
content::RenderProcessHost* process = host->GetProcess();
- result->push_back(
- constructInspectView(web_contents->GetURL(),
- process->GetID(),
- host->GetRoutingID(),
- process->GetBrowserContext()->IsOffTheRecord(),
- false));
+ bool is_background_page =
+ (web_contents->GetURL() == BackgroundInfo::GetBackgroundURL(extension));
+ result->push_back(constructInspectView(
+ web_contents->GetURL(),
+ process->GetID(),
+ host->GetRoutingID(),
+ process->GetBrowserContext()->IsOffTheRecord(),
+ is_background_page && has_generated_background_page));
}
}
@@ -375,17 +380,21 @@ void DeveloperPrivateGetItemsInfoFunction::
const ShellWindowRegistry::ShellWindowList windows =
registry->GetShellWindowsForApp(extension->id());
+ bool has_generated_background_page =
+ BackgroundInfo::HasGeneratedBackgroundPage(extension);
for (ShellWindowRegistry::const_iterator it = windows.begin();
it != windows.end(); ++it) {
content::WebContents* web_contents = (*it)->web_contents();
RenderViewHost* host = web_contents->GetRenderViewHost();
content::RenderProcessHost* process = host->GetProcess();
- result->push_back(
- constructInspectView(web_contents->GetURL(),
- process->GetID(),
- host->GetRoutingID(),
- process->GetBrowserContext()->IsOffTheRecord(),
- false));
+ bool is_background_page =
+ (web_contents->GetURL() == BackgroundInfo::GetBackgroundURL(extension));
+ result->push_back(constructInspectView(
+ web_contents->GetURL(),
+ process->GetID(),
+ host->GetRoutingID(),
+ process->GetBrowserContext()->IsOffTheRecord(),
+ is_background_page && has_generated_background_page));
}
}
@@ -423,6 +432,7 @@ ItemInspectViewList DeveloperPrivateGetItemsInfoFunction::
ExtensionProcessManager* process_manager =
ExtensionSystem::Get(profile())->process_manager();
GetInspectablePagesForExtensionProcess(
+ extension,
process_manager->GetRenderViewHostsForExtension(extension->id()),
&result);
@@ -449,6 +459,7 @@ ItemInspectViewList DeveloperPrivateGetItemsInfoFunction::
process_manager = ExtensionSystem::Get(
service->profile()->GetOffTheRecordProfile())->process_manager();
GetInspectablePagesForExtensionProcess(
+ extension,
process_manager->GetRenderViewHostsForExtension(extension->id()),
&result);

Powered by Google App Engine
This is Rietveld 408576698