diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 13:40:01 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 13:40:01 +0000 |
| commit | 0329a07182f593bcbb9ba29f97b89eb64359b18b (patch) | |
| tree | b324add1505505cadb0dc5d5b4110e1b17449b02 /chrome/renderer | |
| parent | ac96c83dbfdc39b85b7078a342d9ca6034897fd8 (diff) | |
| download | chromium_src-0329a07182f593bcbb9ba29f97b89eb64359b18b.zip chromium_src-0329a07182f593bcbb9ba29f97b89eb64359b18b.tar.gz chromium_src-0329a07182f593bcbb9ba29f97b89eb64359b18b.tar.bz2 | |
Fix merge error (benign) from r20910
TBR=mpcomplete
Review URL: http://codereview.chromium.org/149783
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/renderer_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/renderer/resources/extension_process_bindings.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 4af745f..6be873d 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This comment is only here because changes to resources are not picked up -without changes to the corresponding grd file. weeeeee! --> +without changes to the corresponding grd file. yipeee! --> <grit latest_public_release="0" current_release="1"> <outputs> <output filename="grit/renderer_resources.h" type="rc_header"> diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js index 3f05543..b9a0548 100644 --- a/chrome/renderer/resources/extension_process_bindings.js +++ b/chrome/renderer/resources/extension_process_bindings.js @@ -15,7 +15,6 @@ var chrome = chrome || {}; native function StartRequest(); native function GetCurrentPageActions(); native function GetViews(); - native function GetCurrentPageActions(); native function GetChromeHidden(); native function GetNextRequestId(); |