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

Unified Diff: trunk/src/chrome/renderer/extensions/chrome_v8_context.cc

Issue 13852042: Revert 195143 "Prevent chrome.app JSON schema from loading on ev..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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: trunk/src/chrome/renderer/extensions/chrome_v8_context.cc
===================================================================
--- trunk/src/chrome/renderer/extensions/chrome_v8_context.cc (revision 195229)
+++ trunk/src/chrome/renderer/extensions/chrome_v8_context.cc (working copy)
@@ -154,20 +154,9 @@
Feature::Availability ChromeV8Context::GetAvailability(
const std::string& api_name) {
- return GetAvailabilityInternal(api_name, extension_);
-}
-
-Feature::Availability ChromeV8Context::GetAvailabilityForContext(
- const std::string& api_name) {
- return GetAvailabilityInternal(api_name, NULL);
-}
-
-Feature::Availability ChromeV8Context::GetAvailabilityInternal(
- const std::string& api_name,
- const Extension* extension) {
return ExtensionAPI::GetSharedInstance()->IsAvailable(
api_name,
- extension,
+ extension_,
context_type_,
UserScriptSlave::GetDataSourceURLForFrame(web_frame_));
}
« no previous file with comments | « trunk/src/chrome/renderer/extensions/chrome_v8_context.h ('k') | trunk/src/chrome/renderer/extensions/dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698