| Index: webkit/glue/devtools/js/devtools.js
|
| diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
|
| index 5ff7561ed02dda815ea5bb6ae3f9da7e8046ea30..2615bc48afadc98b947c74b35220bd7a4304861b 100644
|
| --- a/webkit/glue/devtools/js/devtools.js
|
| +++ b/webkit/glue/devtools/js/devtools.js
|
| @@ -153,26 +153,8 @@ var context = {}; // Used by WebCore's inspector routines.
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // Here and below are overrides to existing WebInspector methods only.
|
| // TODO(pfeldman): Patch WebCore and upstream changes.
|
| -(function () {
|
| -
|
| var oldLoaded = WebInspector.loaded;
|
| -
|
| -function loadDevToolsStrings() {
|
| - var locale = DevToolsHost.getApplicationLocale();
|
| - locale = locale.replace('_', '-');
|
| -
|
| - var devtoolsStringsScriptElement = document.createElement('script');
|
| - devtoolsStringsScriptElement.addEventListener(
|
| - "load",
|
| - devToolsHandleLoaded.bind(WebInspector),
|
| - false);
|
| - devtoolsStringsScriptElement.type = 'text/javascript';
|
| - devtoolsStringsScriptElement.src = 'l10n/devtoolsStrings_' + locale + '.js';
|
| - document.getElementsByTagName("head").item(0).appendChild(
|
| - devtoolsStringsScriptElement);
|
| -};
|
| -
|
| -function devToolsHandleLoaded() {
|
| +WebInspector.loaded = function() {
|
| devtools.tools = new devtools.ToolsAgent();
|
| devtools.tools.reset();
|
|
|
| @@ -199,18 +181,6 @@ function devToolsHandleLoaded() {
|
| };
|
|
|
|
|
| -// l10n is turned off in tests mode because delayed loading of strings
|
| -// causes test failures.
|
| -if (!window.___interactiveUiTestsMode) {
|
| - window.localizedStrings = {};
|
| - WebInspector.loaded = loadDevToolsStrings;
|
| -} else {
|
| - WebInspector.loaded = devToolsHandleLoaded;
|
| -}
|
| -
|
| -})();
|
| -
|
| -
|
| /**
|
| * This override is necessary for adding script source asynchronously.
|
| * @override
|
| @@ -353,6 +323,15 @@ WebInspector.ScriptsPanel.prototype.__defineGetter__(
|
| })();
|
|
|
|
|
| +/*
|
| + * @override
|
| + * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.
|
| + */
|
| +WebInspector.UIString = function(string) {
|
| + return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));
|
| +};
|
| +
|
| +
|
| // There is no clear way of setting frame title yet. So sniffing main resource
|
| // load.
|
| (function OverrideUpdateResource() {
|
|
|