summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp6
-rw-r--r--build/common.gypi12
-rw-r--r--chrome/browser/browser_about_handler.cc22
-rw-r--r--chrome/browser/ui/webui/options/chromeos/about_page_handler.cc11
-rw-r--r--chrome/chrome_browser.gypi5
-rw-r--r--net/net.gyp6
6 files changed, 12 insertions, 50 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 9e65054..240198e 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -51,6 +51,7 @@
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*',
'../third_party/zlib/zlib.gyp:*',
+ '../v8/tools/gyp/v8.gyp:*',
'../webkit/support/webkit_support.gyp:*',
'../webkit/webkit.gyp:*',
'util/build_util.gyp:*',
@@ -58,11 +59,6 @@
'<(libjpeg_gyp_path):*',
],
'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
- '../v8/tools/gyp/v8.gyp:*',
- ],
- }],
['OS=="mac" or OS=="linux"', {
'dependencies': [
'../third_party/yasm/yasm.gyp:*#host',
diff --git a/build/common.gypi b/build/common.gypi
index a64ab37..821f94c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -37,12 +37,12 @@
# Disable webui dialog replacements for native dialogs by default.
# TODO(flackr): Change this to a runtime flag triggered by
- # --pure-views so that these dialogs can be easily tested.
+ # --pure-views so that these dialogs can be easily tested.
'webui_dialogs%': 0,
# Whether the compositor is enabled on views.
'views_compositor%': 0,
-
+
# Whether or not we are building with the Aura window manager.
'use_aura%': 0,
},
@@ -85,7 +85,7 @@
['touchui==1', {
'webui_dialogs%': 1,
}],
-
+
# Use the views compositor when using the Aura window manager.
['use_aura==1', {
'views_compositor%': 1,
@@ -269,7 +269,7 @@
}, {
'file_manager_extension%': 0,
}],
-
+
# Enable WebUI TaskManager only on Chrome OS and Touch UI.
['chromeos==1 or touchui==1', {
'webui_task_manager%': 1,
@@ -369,10 +369,6 @@
# Currently ignored on Windows.
'coverage%': 0,
- # Overridable specification for potential use of alternative
- # JavaScript engines.
- 'javascript_engine%': 'v8',
-
# Although base/allocator lets you select a heap library via an
# environment variable, the libcmt shim it uses sometimes gets in
# the way. To disable it entirely, and switch to normal msvcrt, do e.g.
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index dac800c..a76bf59 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -60,15 +60,12 @@
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "v8/include/v8.h"
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/webplugininfo.h"
-#ifdef CHROME_V8
-#include "v8/include/v8.h"
-#endif
-
#if defined(OS_WIN)
#include "chrome/browser/enumerate_modules_model_win.h"
#elif defined(OS_CHROMEOS)
@@ -1108,15 +1105,6 @@ std::string AboutVersionStrings(DictionaryValue* localized_strings,
l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_TITLE));
chrome::VersionInfo version_info;
- std::string webkit_version = webkit_glue::GetWebKitVersion();
-#ifdef CHROME_V8
- std::string js_version(v8::V8::GetVersion());
- std::string js_engine = "V8";
-#else
- std::string js_version = webkit_version;
- std::string js_engine = "JavaScriptCore";
-#endif
-
localized_strings->SetString("name",
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
localized_strings->SetString("version", version_info.Version());
@@ -1130,9 +1118,10 @@ std::string AboutVersionStrings(DictionaryValue* localized_strings,
localized_strings->SetString("platform",
l10n_util::GetStringUTF16(IDS_PLATFORM_LABEL));
localized_strings->SetString("os_type", version_info.OSType());
- localized_strings->SetString("webkit_version", webkit_version);
- localized_strings->SetString("js_engine", js_engine);
- localized_strings->SetString("js_version", js_version);
+ localized_strings->SetString("webkit_version",
+ webkit_glue::GetWebKitVersion());
+ localized_strings->SetString("js_engine", "V8");
+ localized_strings->SetString("js_version", v8::V8::GetVersion());
// Obtain the version of the first enabled Flash plugin.
std::vector<webkit::WebPluginInfo> info_array;
@@ -1149,7 +1138,6 @@ std::string AboutVersionStrings(DictionaryValue* localized_strings,
}
localized_strings->SetString("flash_plugin", "Flash");
localized_strings->SetString("flash_version", flash_version);
- localized_strings->SetString("webkit_version", webkit_version);
localized_strings->SetString("company",
l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMPANY_NAME));
localized_strings->SetString("copyright",
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
index 9b39c10..c65f357 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -31,13 +31,10 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "v8/include/v8.h"
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
-#if defined(CHROME_V8)
-#include "v8/include/v8.h"
-#endif
-
namespace {
// These are used as placeholder text around the links in the text in the
@@ -210,14 +207,8 @@ void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
// javascript
-#if defined(CHROME_V8)
localized_strings->SetString("js_engine", "V8");
localized_strings->SetString("js_engine_version", v8::V8::GetVersion());
-#else
- localized_strings->SetString("js_engine", "JavaScriptCore");
- localized_strings->SetString("js_engine_version",
- webkit_glue::GetWebKitVersion());
-#endif
// user agent
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f1a4806..6bc5646 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3850,11 +3850,6 @@
'<(grit_out_dir)/grit/theme_resources_standard_map.cc',
],
'conditions': [
- ['javascript_engine=="v8"', {
- 'defines': [
- 'CHROME_V8',
- ],
- }],
['debug_devtools==1', {
'defines': [
'DEBUG_DEVTOOLS=1',
diff --git a/net/net.gyp b/net/net.gyp
index cf8c4eb..dc928cd 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -34,6 +34,7 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/zlib/zlib.gyp:zlib',
+ '../v8/tools/gyp/v8.gyp:v8',
'net_resources',
'ssl_false_start_blacklist_process#host',
],
@@ -711,11 +712,6 @@
},
],
'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
- '../v8/tools/gyp/v8.gyp:v8',
- ],
- }],
['chromeos==1', {
'sources!': [
'proxy/proxy_config_service_linux.cc',
generated by cgit v1.1 at 2025-02-11 07:03:56 +0000