summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions/app_bindings.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-18 02:05:25 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-18 02:05:25 +0000
commit8774f4b65b6a970dd98e5000888b0c83358f4229 (patch)
treee139fb9d0b4724ff92968f55ffc2ebed50ecd5a8 /chrome/renderer/extensions/app_bindings.cc
parent14acb5764b5a947975d7b7905a1ecdde2b91abad (diff)
downloadchromium_src-8774f4b65b6a970dd98e5000888b0c83358f4229.zip
chromium_src-8774f4b65b6a970dd98e5000888b0c83358f4229.tar.gz
chromium_src-8774f4b65b6a970dd98e5000888b0c83358f4229.tar.bz2
Convert app_bindings.js to the schema_generated_bindings.js infrastructure.
This involves opening up *all* custom bindings to web pages, where access is controlled content-script style using a URL-matches property in the API schema. BUG=104100,117282 TEST=unit_tests,browser_tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=125811 Review URL: http://codereview.chromium.org/9460002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/app_bindings.cc')
-rw-r--r--chrome/renderer/extensions/app_bindings.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
index 34c8047..a5a902a 100644
--- a/chrome/renderer/extensions/app_bindings.cc
+++ b/chrome/renderer/extensions/app_bindings.cc
@@ -55,7 +55,6 @@ const char* kInvalidCallbackIdError = "Invalid callbackId";
} // namespace
-
AppBindings::AppBindings(ExtensionDispatcher* dispatcher,
ChromeV8Context* context)
: ChromeV8Extension(dispatcher),
@@ -72,7 +71,6 @@ AppBindings::AppBindings(ExtensionDispatcher* dispatcher,
base::Bind(&AppBindings::GetAppNotifyChannel, base::Unretained(this)));
}
-
v8::Handle<v8::Value> AppBindings::GetIsInstalled(
const v8::Arguments& args) {
// TODO(aa): Hm, maybe ExtensionBindingsContext should have GetExtension()
@@ -81,9 +79,8 @@ v8::Handle<v8::Value> AppBindings::GetIsInstalled(
extension_dispatcher_->extensions()->GetByID(context_->extension_id());
// TODO(aa): Why only hosted app?
- // TODO(aa): GARRR - why is there IsExtensionActive and IsApplicationActive!?
bool result = extension && extension->is_hosted_app() &&
- extension_dispatcher_->IsApplicationActive(extension->id());
+ extension_dispatcher_->IsExtensionActive(extension->id());
return v8::Boolean::New(result);
}