summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_function.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:46:32 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:46:32 +0000
commit637bf32f0bc3debadd6371992f8a68f0dc30ea7d (patch)
tree34e1acf33d8952710d1298ca07b8ef7640085570 /chrome/browser/extensions/extension_function.cc
parentf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (diff)
downloadchromium_src-637bf32f0bc3debadd6371992f8a68f0dc30ea7d.zip
chromium_src-637bf32f0bc3debadd6371992f8a68f0dc30ea7d.tar.gz
chromium_src-637bf32f0bc3debadd6371992f8a68f0dc30ea7d.tar.bz2
Reland r103624 - Add ExtensionFunctionTest base class and a test
for GetWindowFunction using it. Review URL: http://codereview.chromium.org/8098023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function.cc')
-rw-r--r--chrome/browser/extensions/extension_function.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index 0374dd0..998b1b0 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -43,7 +43,7 @@ void UIThreadExtensionFunction::RenderViewHostTracker::Observe(
ExtensionFunction::ExtensionFunction()
: request_id_(-1),
- profile_(NULL),
+ profile_id_(NULL),
has_callback_(false),
include_incognito_(false),
user_gesture_(false),
@@ -75,6 +75,10 @@ const std::string ExtensionFunction::GetResult() {
return json;
}
+Value* ExtensionFunction::GetResultValue() {
+ return result_.get();
+}
+
const std::string ExtensionFunction::GetError() {
return error_;
}