Chromium Code Reviews| Index: chrome/renderer/extensions/chrome_v8_context.cc |
| diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc |
| index b7a4d64a57b61cb917b7d7aabd60306ea650af03..06f6000afd8db46373af35f2c9bfba70bd1b31d9 100644 |
| --- a/chrome/renderer/extensions/chrome_v8_context.cc |
| +++ b/chrome/renderer/extensions/chrome_v8_context.cc |
| @@ -24,11 +24,6 @@ namespace extensions { |
| namespace { |
| const char kChromeHidden[] = "chromeHidden"; |
| -const char kUnavailableMessage[] = "You do not have permission to access this " |
| - "API. Ensure that the required permission " |
| - "or manifest property is included in your " |
| - "manifest.json."; |
| - |
| const char kValidateCallbacks[] = "validateCallbacks"; |
| const char kValidateAPI[] = "validateAPI"; |
| @@ -156,11 +151,9 @@ bool ChromeV8Context::CallChromeHiddenMethod( |
| const std::set<std::string>& ChromeV8Context::GetAvailableExtensionAPIs() { |
| if (!available_extension_apis_initialized_) { |
| + // TODO(cduvall): Change this because Stubs probably fails. |
|
not at google - send to devlin
2013/03/14 19:16:46
you have permission to change stubs if reasonable
cduvall
2013/03/21 22:27:55
Ended up just having to change getApiDefinitions i
|
| available_extension_apis_ = |
| - ExtensionAPI::GetSharedInstance()->GetAPIsForContext( |
| - context_type_, |
| - extension_, |
| - UserScriptSlave::GetDataSourceURLForFrame(web_frame_)); |
| + ExtensionAPI::GetSharedInstance()->GetAllAPINames(); |
| available_extension_apis_initialized_ = true; |
| } |
| return available_extension_apis_; |
| @@ -168,15 +161,11 @@ const std::set<std::string>& ChromeV8Context::GetAvailableExtensionAPIs() { |
| Feature::Availability ChromeV8Context::GetAvailability( |
| const std::string& api_name) { |
| - const std::set<std::string>& available_apis = GetAvailableExtensionAPIs(); |
| - |
| - // TODO(cduvall/kalman): Switch to ExtensionAPI::IsAvailable() once Features |
| - // are complete. |
| - if (available_apis.find(api_name) != available_apis.end()) |
| - return Feature::CreateAvailability(Feature::IS_AVAILABLE, ""); |
| - |
| - return Feature::CreateAvailability(Feature::INVALID_CONTEXT, |
| - kUnavailableMessage); |
| + return ExtensionAPI::GetSharedInstance()->IsAvailable( |
| + api_name, |
| + extension_, |
| + context_type_, |
| + UserScriptSlave::GetDataSourceURLForFrame(web_frame_)); |
| } |
| void ChromeV8Context::DispatchOnLoadEvent(bool is_incognito_process, |