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

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: Rebase 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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9b39c103d216581621971373dc5b784fa2ab6d97..c65f357de7c55f314ad42ebade4d7e261ef964e6 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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698