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

Unified Diff: chrome/browser/resources/history/history.html

Issue 22600003: Switch to using '-t ios' for grit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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_resources.grd ('k') | chrome/browser/resources/history/history_mobile.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/history/history.html
diff --git a/chrome/browser/resources/history/history.html b/chrome/browser/resources/history/history.html
index 107fcfd9088dac4bdbe02719bc4d604a5c889e73..a58e433ede99dde4d199c6f8731679c96f664961 100644
--- a/chrome/browser/resources/history/history.html
+++ b/chrome/browser/resources/history/history.html
@@ -2,7 +2,7 @@
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
-<if expr="is_android or pp_ifdef('ios')">
+<if expr="is_android or is_ios">
<meta name="viewport" content="width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no">
</if>
@@ -11,19 +11,19 @@
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css">
<link rel="stylesheet" href="chrome://resources/css/menu_button.css">
-<if expr="not is_android and not pp_ifdef('ios')">
+<if expr="not is_android and not is_ios">
<link rel="stylesheet" href="alert_overlay.css">
<link rel="stylesheet" href="chrome://resources/css/overlay.css">
</if>
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
-<if expr="not is_android and not pp_ifdef('ios')">
+<if expr="not is_android and not is_ios">
<link rel="stylesheet" href="../uber/uber_shared.css">
</if>
<link rel="stylesheet" href="history.css">
-<if expr="is_android or pp_ifdef('ios')">
+<if expr="is_android or is_ios">
<link rel="stylesheet" href="history_mobile.css">
</if>
-<if expr="not is_android and not pp_ifdef('ios')">
+<if expr="not is_android and not is_ios">
<link rel="stylesheet" href="other_devices.css">
</if>
@@ -34,7 +34,7 @@
<script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
<script src="chrome://resources/js/cr/ui/menu_item.js"></script>
<script src="chrome://resources/js/cr/ui/menu.js"></script>
-<if expr="not is_android and not pp_ifdef('ios')">
+<if expr="not is_android and not is_ios">
<script src="chrome://resources/js/cr/ui/alert_overlay.js"></script>
<script src="chrome://resources/js/cr/ui/overlay.js"></script>
</if>
@@ -54,15 +54,15 @@
</head>
-<if expr="not is_android">
+<if expr="not is_android and not is_ios">
<body class="uber-frame"
i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
</if>
-<if expr="is_android or pp_ifdef('ios')">
+<if expr="is_android or is_ios">
<body i18n-values=".style.fontFamily:fontfamily">
</if>
-<if expr="not is_android and not pp_ifdef('ios')">
+<if expr="not is_android and not is_ios">
<div id="overlay" class="overlay" hidden>
<include src="alert_overlay.html">
</div>
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/history/history_mobile.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698