diff options
| author | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 19:16:44 +0000 |
|---|---|---|
| committer | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 19:16:44 +0000 |
| commit | 0f34d9082e0b16e83d3e4c8fbf296a09509e4702 (patch) | |
| tree | e7f63013bfa2e4a30f94e03d5082bcfe5090a701 /chrome/renderer | |
| parent | 9bab0bbdf66d73e5a7ec81e9ef18f2be2387499c (diff) | |
| download | chromium_src-0f34d9082e0b16e83d3e4c8fbf296a09509e4702.zip chromium_src-0f34d9082e0b16e83d3e4c8fbf296a09509e4702.tar.gz chromium_src-0f34d9082e0b16e83d3e4c8fbf296a09509e4702.tar.bz2 | |
Move ownership of ExtensionAction into ExtensionSystem.
ExtensionActions will be created by ExtensionActionManager during the
EXTENSION_LOADED notification and destroyed during EXTENSION_UNLOADED. In this
change, the ExtensionActionManager inserts pointers to the ExtensionActions into
their Extension, but those pointers will go away in the next refactoring step.
This is part of a 4-part refactoring to clean up ExtensionAction icon handling.
The subsequent parts are:
2) Change ExtensionAction accesses from using Extension::*action() to using
ExtensionSystem.
3) Move ExtensionAction from common/ to browser/
4) Make the icon-loading and -caching classes into ExtensionAction methods.
BUG=153463
Review URL: https://chromiumcodereview.appspot.com/11032013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/page_actions_custom_bindings.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/page_actions_custom_bindings.cc b/chrome/renderer/extensions/page_actions_custom_bindings.cc index 1edad32..b74397f 100644 --- a/chrome/renderer/extensions/page_actions_custom_bindings.cc +++ b/chrome/renderer/extensions/page_actions_custom_bindings.cc @@ -31,8 +31,8 @@ v8::Handle<v8::Value> PageActionsCustomBindings::GetCurrentPageActions( CHECK(extension); v8::Local<v8::Array> page_action_vector = v8::Array::New(); - if (extension->page_action()) { - std::string id = extension->page_action()->id(); + if (extension->page_action_info()) { + std::string id = extension->page_action_info()->id; page_action_vector->Set(v8::Integer::New(0), v8::String::New(id.c_str(), id.size())); } |