Remove pp_ifdef from resource files in chrome/app/.

Remove pp_ifdef from resource files in chrome/app/.

Generated using:
> cd src/chrome/app
> git grep -l pp_ifdef | xargs sed -i "s:pp_ifdef('\([^']\+\)'):\1:g"

BUG=343235
R=oshima@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=252072

[newt (away), 2014-02-19 01:15:35]

more of the same :)

PTAL, thanks!

[oshima, 2014-02-19 18:40:26]

lgtm

[newt (away), 2014-02-19 19:26:57]

The CQ bit was checked by newt@chromium.org

[commit-bot: I haz the power, 2014-02-19 19:39:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/171673004/1

[commit-bot: I haz the power, 2014-02-19 19:39:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-19 19:39:29]

Failed to apply patch for chrome/app/theme/theme_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/theme/theme_resources.grd
  Hunk #8 FAILED at 234.
  1 out of 33 hunks FAILED -- saving rejects to file
chrome/app/theme/theme_resources.grd.rej

Patch:       chrome/app/theme/theme_resources.grd
Index: chrome/app/theme/theme_resources.grd
diff --git a/chrome/app/theme/theme_resources.grd
b/chrome/app/theme/theme_resources.grd
index
dcbebfaeb6791eff809065bb604f47120fee72d2..f82251aed057fc39ee9e105b57b9e75051bd0299
100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -37,22 +37,22 @@
       <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS"
file="common/allowed_popups.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON"
file="app_default_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW"
file="app_droparrow.png" />
-      <if expr="pp_ifdef('enable_app_list') and is_win and not
pp_ifdef('_google_chrome')">
+      <if expr="enable_app_list and is_win and not _google_chrome">
         <structure type="chrome_scaled_image" name="IDR_APP_LIST"
file="chromium/app_list_48.png" />
       </if>
-      <if expr="pp_ifdef('enable_app_list') and is_win and
pp_ifdef('_google_chrome')">
+      <if expr="enable_app_list and is_win and _google_chrome">
         <structure type="chrome_scaled_image" name="IDR_APP_LIST"
file="google_chrome/app_list_48.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_LIST_SXS"
file="google_chrome/app_list_sxs_48.png" />
       </if>
-      <if expr="pp_ifdef('enable_app_list') and pp_ifdef('_google_chrome')">
+      <if expr="enable_app_list and _google_chrome">
         <structure type="chrome_scaled_image"
name="IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH"
file="google_chrome/google_logo_voice_search.png" />
       </if>
-      <if expr="pp_ifdef('enable_app_list')">
+      <if expr="enable_app_list">
         <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY"
file="common/app_list_v1_overlay.png" />
         <structure type="chrome_scaled_image"
name="IDR_APP_LIST_MIC_HOTWORD_OFF" file="common/app_list_mic_hotword_off.png"
/>
       </if>
       <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA"
file="ask_media.png" />
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="toolkit_views">
         <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE"
file="win/app_window_close.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H"
file="win/app_window_close_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P"
file="win/app_window_close_active.png" />
@@ -74,7 +74,7 @@
       <structure type="chrome_scaled_image"
name="IDR_AUTOFILL_DIALOG_MENU_BUTTON_D"
file="common/autofill_dialog_menu_button_disabled.png" />
       <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON"
file="common/autofill_tooltip_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON_H"
file="common/autofill_tooltip_icon_hover.png" />
-      <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not
is_ios">
+      <if expr="not toolkit_views and not is_macosx and not is_ios">
         <structure type="chrome_scaled_image" name="IDR_BACK" file="back.png"
/>
         <structure type="chrome_scaled_image" name="IDR_BACK_D"
file="back_disabled.png" />
         <structure type="chrome_scaled_image" name="IDR_BACK_H"
file="back_hover.png" />
@@ -82,7 +82,7 @@
       </if>
       <!-- TODO(jamescook): Update all Chrome platforms to use the new art and
metrics
            from Ash, crbug.com/118228 -->
-      <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
+      <if expr="toolkit_views or is_macosx or is_ios">
         <structure type="chrome_scaled_image" name="IDR_BACK"
file="common/browser_back_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_BACK_D"
file="common/browser_back_disabled.png" />
         <structure type="chrome_scaled_image" name="IDR_BACK_H"
file="common/browser_back_hover.png" />
@@ -114,17 +114,17 @@
         <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER"
file="common/bookmark_bar_folder.png" />
       </if>
       <structure type="chrome_scaled_image"
name="IDR_BOOKMARK_BAR_APPS_SHORTCUT" file="common/apps_bookmark_bar_icon.png"
/>
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_scaled_image"
name="IDR_BUTTON_USER_IMAGE_CHOOSE_FILE" file="choose_file.png" />
         <structure type="chrome_scaled_image"
name="IDR_BUTTON_USER_IMAGE_TAKE_PHOTO" file="take_photo.png" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not
is_ios">
+      <if expr="not toolkit_views and not is_macosx and not is_ios">
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION"
file="browser_action.png" />
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H"
file="browser_action_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P"
file="browser_action_pressed.png" />
         <structure type="chrome_scaled_image"
name="IDR_BROWSER_ACTION_HIGHLIGHT" file="browser_action_highlight.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
+      <if expr="toolkit_views or is_macosx or is_ios">
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION"
file="common/browser_action_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H"
file="common/browser_action_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P"
file="common/browser_action_pressed.png" />
@@ -139,10 +139,10 @@
       </if>
       <!-- Ash doesn't draw rounded content area, so needs a special top
            image. -->
-      <if expr="not pp_ifdef('use_ash')">
+      <if expr="not use_ash">
         <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER"
file="content_top_center.png" />
       </if>
-      <if expr="pp_ifdef('use_ash')">
+      <if expr="use_ash">
         <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER"
file="cros/content_top_center.png" />
         <if expr="is_win">
           <structure type="chrome_scaled_image"
name="IDR_CONTENT_TOP_CENTER_WIN" file="content_top_center.png" />
@@ -155,14 +155,14 @@
       <structure type="chrome_scaled_image"
name="IDR_CONTROLLED_SETTING_EXTENSION"
file="common/controlled_setting_extension.png" />
       <structure type="chrome_scaled_image"
name="IDR_CONTROLLED_SETTING_MANDATORY"
file="common/controlled_setting_mandatory.png" />
       <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER"
file="common/controlled_setting_owner.png" />
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_scaled_image"
name="IDR_CONTROLLED_SETTING_SHARED" file="cros/controlled_setting_shared.png"
/>
       </if>
       <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON"
file="cookie.png" />
       <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON"
file="cookie_storage.png" />
       <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT"
file="common/credit_card_cvc_hint.png" />
       <structure type="chrome_scaled_image"
name="IDR_CREDIT_CARD_CVC_HINT_AMEX" file="common/credit_card_cvc_hint_amex.png"
/>
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_scaled_image" name="IDR_CROS_DEFAULT_THROBBER"
file="cros/default_throbber.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_DOCK_HIGH"
file="dock_tab_high.png" />
@@ -217,13 +217,13 @@
       <if expr="is_android">
         <structure type="chrome_scaled_image"
name="IDR_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_ICON"
file="infobar_protected_media_identifier.png" />
       </if>
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_scaled_image" name="IDR_ENROLL_FAILURE"
file="enroll_failure.png" />
         <structure type="chrome_scaled_image" name="IDR_ENROLL_SUCCESS"
file="enroll_success.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_ERROR_NETWORK_GENERIC"
file="common/error_network_generic.png" />
       <structure type="chrome_scaled_image" name="IDR_ERROR_NETWORK_OFFLINE"
file="common/error_network_offline.png" />
-      <if expr="pp_ifdef('enable_extensions')">
+      <if expr="enable_extensions">
         <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_FAVICON"
file="common/favicon_extensions.png" />
         <structure type="chrome_scaled_image"
name="IDR_EXTENSIONS_SCRIPT_BUBBLE" file="common/script_bubble.png" />
         <structure type="chrome_scaled_image"
name="IDR_EXTENSIONS_RATING_STAR_HALF_LEFT"
file="extensions_rating_star_half_left.png" />
@@ -234,14 +234,14 @@
         <structure type="chrome_scaled_image"
name="IDR_EXTENSION_COMMAND_CLOSE" file="extension_command_close.png" />
         <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON"
file="extension_default_icon.png" />
       </if>
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_scaled_image" name="IDR_FATAL_ERROR"
file="cros/fatal_error.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK"
file="feedback.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H"
file="feedback_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P"
file="feedback_pressed.png" />
 
-      <if expr="pp_ifdef('chromeos')">
+      <if expr="chromeos">
         <structure type="chrome_sca…
(message too large)

[newt (away), 2014-02-19 20:48:37]

Committed patchset #2 manually as r252072 (presubmit successful).