diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 01:26:36 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 01:26:36 +0000 |
| commit | 44f3466d62f1c70a90b72cfe1978e1b7fea85a74 (patch) | |
| tree | 4a5e70c057cec2db67121de53b6f78ddd7fcf5ae /chrome/browser/resources/extensions | |
| parent | 01d728c3f65a597c6810ecab335cdbc2313f2347 (diff) | |
| download | chromium_src-44f3466d62f1c70a90b72cfe1978e1b7fea85a74.zip chromium_src-44f3466d62f1c70a90b72cfe1978e1b7fea85a74.tar.gz chromium_src-44f3466d62f1c70a90b72cfe1978e1b7fea85a74.tar.bz2 | |
Revert 117136 - separate about page into its own page (included in chrome://chrome)
for now it's only enabled in cros, but we plan to have a version for desktop chrome as well, which is why I took it out of the chromeos namespace.
BUG=109203
TEST=manual
Review URL: http://codereview.chromium.org/9124028
TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/9147054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/extensions')
| -rw-r--r-- | chrome/browser/resources/extensions/extensions.html | 7 | ||||
| -rw-r--r-- | chrome/browser/resources/extensions/extensions.js | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html index 2af2f73..3426c99 100644 --- a/chrome/browser/resources/extensions/extensions.html +++ b/chrome/browser/resources/extensions/extensions.html @@ -21,6 +21,9 @@ <script src="chrome://extensions-frame/extension_list.js"></script> <script src="chrome://extensions-frame/extensions.js"></script> +<script src="chrome://extensions-frame/strings.js"></script> +<script src="chrome://resources/js/i18n_template.js"></script> +<script src="chrome://resources/js/i18n_process.js"></script> </head> <body> @@ -135,9 +138,5 @@ </div> -<script src="chrome://extensions-frame/strings.js"></script> -<script src="chrome://resources/js/i18n_template.js"></script> -<script src="chrome://resources/js/i18n_process.js"></script> - </body> </html> diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js index 0ffd25d..fcedbf1 100644 --- a/chrome/browser/resources/extensions/extensions.js +++ b/chrome/browser/resources/extensions/extensions.js @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -180,5 +180,6 @@ cr.define('extensions', function() { var ExtensionSettings = extensions.ExtensionSettings; window.onload = function() { + i18nTemplate.process(document, templateData); ExtensionSettings.getInstance().initialize(); -}; +} |