Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(984)

Unified Diff: chrome/browser/ui/webui/options/chromeos/about_page_handler.cc

Issue 7864014: Remove CHROME_V8 #define and related javascript_engine gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
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 ce12780b9547b466386e42b3708305b7137e54be..9a7a4c8d47ee8c017c0a5b7631a561ae23229cb5 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -25,11 +25,8 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "webkit/glue/webkit_glue.h"
-
-#if defined(CHROME_V8)
#include "v8/include/v8.h"
-#endif
+#include "webkit/glue/webkit_glue.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/power_library.h"
@@ -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

Powered by Google App Engine
This is Rietveld 408576698