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

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

Issue 12253022: Manifest handler for all keys background-related. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 3330c12e4a76b22a0c662be73867b6e66a403eaf..2d6638e4c3dfe3e9d3c79ece474aef45ab5cd0bd 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -44,6 +44,7 @@
#include "chrome/browser/view_type_utils.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/background_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -974,10 +975,12 @@ ExtensionSettingsHandler::GetInspectablePagesForExtension(
extension_service_->profile(), &result);
// Include a link to start the lazy background page, if applicable.
- if (extension->has_lazy_background_page() && extension_is_enabled &&
+ if (extensions::BackgroundInfo::HasLazyBackgroundPage(extension) &&
+ extension_is_enabled &&
!process_manager->GetBackgroundHostForExtension(extension->id())) {
result.push_back(
- ExtensionPage(extension->GetBackgroundURL(), -1, -1, false));
+ ExtensionPage(extensions::BackgroundInfo::GetBackgroundURL(extension),
+ -1, -1, false));
}
// Repeat for the incognito process, if applicable. Don't try to get
@@ -991,10 +994,12 @@ ExtensionSettingsHandler::GetInspectablePagesForExtension(
process_manager->GetRenderViewHostsForExtension(extension->id()),
&result);
- if (extension->has_lazy_background_page() && extension_is_enabled &&
+ if (extensions::BackgroundInfo::HasLazyBackgroundPage(extension)
+ && extension_is_enabled &&
!process_manager->GetBackgroundHostForExtension(extension->id())) {
result.push_back(
- ExtensionPage(extension->GetBackgroundURL(), -1, -1, true));
+ ExtensionPage(extensions::BackgroundInfo::GetBackgroundURL(extension),
+ -1, -1, true));
}
}
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698