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

Side by Side Diff: chrome/renderer/extensions/page_actions_custom_bindings.cc

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/extensions/page_actions_custom_bindings.h" 5 #include "chrome/renderer/extensions/page_actions_custom_bindings.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "chrome/common/extensions/api/extension_action/action_info.h" 9 #include "chrome/common/extensions/api/extension_action/action_info.h"
10 #include "chrome/common/extensions/extension.h" 10 #include "chrome/common/extensions/extension.h"
(...skipping 14 matching lines...) Expand all
25 const v8::Arguments& args) { 25 const v8::Arguments& args) {
26 PageActionsCustomBindings* self = 26 PageActionsCustomBindings* self =
27 GetFromArguments<PageActionsCustomBindings>(args); 27 GetFromArguments<PageActionsCustomBindings>(args);
28 std::string extension_id = *v8::String::Utf8Value(args[0]->ToString()); 28 std::string extension_id = *v8::String::Utf8Value(args[0]->ToString());
29 CHECK(!extension_id.empty()); 29 CHECK(!extension_id.empty());
30 const Extension* extension = 30 const Extension* extension =
31 self->dispatcher_->extensions()->GetByID(extension_id); 31 self->dispatcher_->extensions()->GetByID(extension_id);
32 CHECK(extension); 32 CHECK(extension);
33 33
34 v8::Local<v8::Array> page_action_vector = v8::Array::New(); 34 v8::Local<v8::Array> page_action_vector = v8::Array::New();
35 if (extension->page_action_info()) { 35 if (ActionInfo::GetPageActionInfo(extension)) {
36 std::string id = extension->page_action_info()->id; 36 std::string id = ActionInfo::GetPageActionInfo(extension)->id;
37 page_action_vector->Set(v8::Integer::New(0), 37 page_action_vector->Set(v8::Integer::New(0),
38 v8::String::New(id.c_str(), id.size())); 38 v8::String::New(id.c_str(), id.size()));
39 } 39 }
40 40
41 return page_action_vector; 41 return page_action_vector;
42 } 42 }
43 43
44 } // extensions 44 } // extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698