diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.vcproj | 2 | ||||
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 17 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.rc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/about_version.html | 120 | ||||
| -rw-r--r-- | chrome/browser/resources/browser_resources.vcproj | 6 |
5 files changed, 105 insertions, 42 deletions
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 835d78c..18a67e2 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -75,7 +75,7 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets=".\browser.vsprops;$(SolutionDir)..\build\release.vsprops" + InheritedPropertySheets=".\browser.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)\tools\build\win\js_engine.vsprops" > <Tool Name="VCPreBuildEventTool" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index fca4e8d..3dd1ee0 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -62,6 +62,9 @@ #include "chrome/renderer/about_handler.h" #include "googleurl/src/gurl.h" #include "webkit/glue/webkit_glue.h" +#ifdef CHROME_V8 +#include "v8/public/v8.h" +#endif #include "generated_resources.h" @@ -254,9 +257,23 @@ std::string BrowserAboutHandler::AboutVersion() { DLOG(ERROR) << "Unable to create FileVersionInfo object"; return std::string(); } + + std::wstring webkit_version = UTF8ToWide(webkit_glue::GetWebKitVersion()); +#ifdef CHROME_V8 + const char* v8_vers = v8::V8::GetVersion(); + std::wstring js_version = UTF8ToWide(v8_vers); + std::wstring js_engine = L"V8"; +#else + std::wstring js_version = webkit_version; + std::wstring js_engine = L"JavaScriptCore"; +#endif + localized_strings.SetString(L"name", l10n_util::GetString(IDS_PRODUCT_NAME)); localized_strings.SetString(L"version", version_info->file_version()); + localized_strings.SetString(L"js_engine", js_engine); + localized_strings.SetString(L"js_version", js_version); + localized_strings.SetString(L"webkit_version", webkit_version); localized_strings.SetString(L"company", l10n_util::GetString(IDS_ABOUT_VERSION_COMPANY_NAME)); localized_strings.SetString(L"copyright", diff --git a/chrome/browser/browser_resources.rc b/chrome/browser/browser_resources.rc index 399c882..46faac8 100644 --- a/chrome/browser/browser_resources.rc +++ b/chrome/browser/browser_resources.rc @@ -14,7 +14,7 @@ // IDR_ABOUT_PLUGINS_HTML BINDATA "browser\\resources\\about_plugins.html" -IDR_ABOUT_VERSION_HTML BINDATA "browser\\resources\\about_version.html" +IDR_ABOUT_VERSION_HTML BINDATA "browser_resources\\about_version_flat.html" IDR_ABOUT_MEMORY_HTML BINDATA "browser_resources\\about_memory_flat.html" IDR_ABOUT_STATS_HTML BINDATA "browser\\resources\\about_stats.html" IDR_SSL_ROAD_BLOCK_HTML BINDATA "browser_resources\\ssl_roadblock_flat.html" diff --git a/chrome/browser/resources/about_version.html b/chrome/browser/resources/about_version.html index b56b3dd..1df848b 100644 --- a/chrome/browser/resources/about_version.html +++ b/chrome/browser/resources/about_version.html @@ -5,43 +5,85 @@ about:version template page --> <html id="t"> -<head> -<title jscontent="title"></title> -<style type="text/css"> -body { - background-color: Window; - color: WindowText; - font: message-box; -} -#outer { - text-align: left; -} -#name { - font-weight: bold; - font-size: 1.2em; -} -#logo { - float: left; - padding-right: 20px; - padding-bottom: 200px; -} -#useragent { - white-space: nowrap; - font-face: fixed; - font-size: 0.8em; -} -</style> -</head> -<body> -<!-- TODO: figure out a way to embed a real image --> -<img id="logo" src="http://www.google.com/intl/en_ALL/images/logo.gif" /> -<div id="outer"> -<div id="name" jscontent="name"></div> -<div id="version"><span jscontent="version"></span> (<span jscontent="cl"></span>)</div> -<div id="official" jscontent="official"></div> -<div id="company" jscontent="company"></div> -<div id="copyright" jscontent="copyright"></div> -<div id="useragent" jscontent="useragent"></div> -</div> -</body> + <head> + <title jscontent="title"></title> + <style type="text/css"> + body { + font-family:arial; + background-color:white; + color: black; + margin: 0px; + } + #outer { + text-align: left; + margin-top: 10px; + margin-left: auto; + margin-right: auto; + width: 800px; + } + #inner { + padding-top: 10px; + width: 550px; + } + .label { + font-weight: bold; + text-align: right; + width: 120px; + padding-right: 5px; + font-size: 0.9em; + border-right: 0px solid black; + } + .label:after { + content: ":"; + } + #logo { + text-align: right; + float: right; + width: 180px; + margin-left: 40px; + } + #company { + text-align: right; + font-size: 0.7em; + } + #copyright { + text-align: right; + font-size: 0.7em; + } + #name { + } + #useragent { + font-family: monospace; + } + .version { + font-family: monospace; + padding-left: 5px; + } + </style> + </head> + + <body> + <div id="outer"> + <div id="logo"> + <img src="../../app/theme/product_logo.png" /> + <div id="company" jscontent="company"></div> + <div id="copyright" jscontent="copyright"></div> + </div> + <table id="inner" cellpadding="0" cellspacing="0" border="0"> + <tr><td class="label" valign="top" id="name" jscontent="name"></td> + <td class="version" id="version"><span jscontent="version"></span> (<span jscontent="official"></span> <span jscontent="cl"></span>)</td> + </tr> + <tr><td class="label" valign="top">WebKit</td> + <td class="version" id="webkit_version" jscontent="webkit_version"></td> + </tr> + <tr><td class="label" valign="top" jscontent="js_engine"></td> + <td class="version" id="js_version" jscontent="js_version"></td> + </tr> + <tr><td class="label" valign="top">User Agent</td> + <td class="version" id="useragent" jscontent="useragent"></td> + </tr> + </table> + </div> + </body> + </html> diff --git a/chrome/browser/resources/browser_resources.vcproj b/chrome/browser/resources/browser_resources.vcproj index a0a0b69..276f25c 100644 --- a/chrome/browser/resources/browser_resources.vcproj +++ b/chrome/browser/resources/browser_resources.vcproj @@ -72,7 +72,7 @@ > </File> <File - RelativePath=".\new_tab.html" + RelativePath=".\about_version.html" > </File> <File @@ -80,6 +80,10 @@ > </File> <File + RelativePath=".\new_tab.html" + > + </File> + <File RelativePath=".\safe_browsing_malware_block.html" > </File> |