| Index: chrome/renderer/extensions/app_bindings.cc
|
| diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
|
| index e502ce65c856dcf830b40fce6499a1bc690bcc61..0c95fda7f9838ec297629317de2e28430bcd0e54 100644
|
| --- a/chrome/renderer/extensions/app_bindings.cc
|
| +++ b/chrome/renderer/extensions/app_bindings.cc
|
| @@ -86,18 +86,22 @@ class AppBindingsHandler : public ChromeV8ExtensionHandler {
|
| } // namespace
|
|
|
|
|
| -AppBindings::AppBindings(ExtensionDispatcher* dispatcher)
|
| - : ChromeV8Extension("extensions/app.js", IDR_APP_BINDINGS_JS,
|
| - dispatcher) {
|
| -}
|
| +AppBindings::AppBindings(
|
| + int dependency_count,
|
| + const char** dependencies,
|
| + ExtensionDispatcher* extension_dispatcher)
|
| + : ChromeV8Extension(
|
| + "extensions/app_custom_bindings.js",
|
| + IDR_APP_CUSTOM_BINDINGS_JS,
|
| + dependency_count,
|
| + dependencies,
|
| + extension_dispatcher) {}
|
|
|
| ChromeV8ExtensionHandler* AppBindings::CreateHandler(
|
| ChromeV8Context* context) {
|
| return new AppBindingsHandler(extension_dispatcher(), context);
|
| }
|
|
|
| -
|
| -
|
| AppBindingsHandler::AppBindingsHandler(ExtensionDispatcher* dispatcher,
|
| ChromeV8Context* context)
|
| : ChromeV8ExtensionHandler(context),
|
| @@ -132,10 +136,11 @@ v8::Handle<v8::Value> AppBindingsHandler::GetIsInstalled(
|
| const ::Extension* extension =
|
| dispatcher_->extensions()->GetByID(context_->extension_id());
|
|
|
| + LOG(WARNING) << "is installed? " << extension->id();
|
| +
|
| // TODO(aa): Why only hosted app?
|
| - // TODO(aa): GARRR - why is there IsExtensionActive and IsApplicationActive!?
|
| bool result = extension && extension->is_hosted_app() &&
|
| - dispatcher_->IsApplicationActive(extension->id());
|
| + dispatcher_->IsExtensionActive(extension->id());
|
| return v8::Boolean::New(result);
|
| }
|
|
|
|
|