Revert 250830 "Exclude notification strings for builds that dont..."

> Exclude notification strings for builds that dont use it.
> 
> BUG=326023
> 
> Review URL: https://codereview.chromium.org/160113002

Broke win64 sync tests, e.g. output:

c:\b\build\slave\cr-win-rel-x64\build\src\chrome\browser\sync\test\integration\sync_test.cc(707): error: Value of: UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()-> GetTitle())
  Actual: ""
Expected: "Notifications enabled"

TBR=aurimas@chromium.org

Review URL: https://codereview.chromium.org/163713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251003 0039d316-1c4b-4281-b951-d872f2087c98
parent da72744a
...@@ -616,9 +616,6 @@ ...@@ -616,9 +616,6 @@
'native_memory_pressure_signals%': 1, 'native_memory_pressure_signals%': 1,
'enable_printing%': 2, 'enable_printing%': 2,
'enable_task_manager%':0, 'enable_task_manager%':0,
# Set to 1 once we have a notification system for Android.
# http://crbug.com/115320
'notifications%': 0,
}], }],
# Android OS includes support for proprietary codecs regardless of # Android OS includes support for proprietary codecs regardless of
...@@ -1466,6 +1463,10 @@ ...@@ -1466,6 +1463,10 @@
# Sessions are store separately in the Java side. # Sessions are store separately in the Java side.
'enable_session_service%': 0, 'enable_session_service%': 0,
# Set to 1 once we have a notification system for Android.
# http://crbug.com/115320
'notifications%': 0,
'p2p_apis%' : 0, 'p2p_apis%' : 0,
'gtest_target_type%': 'shared_library', 'gtest_target_type%': 'shared_library',
...@@ -1770,9 +1771,6 @@ ...@@ -1770,9 +1771,6 @@
['enable_task_manager==1', { ['enable_task_manager==1', {
'grit_defines': ['-D', 'enable_task_manager'], 'grit_defines': ['-D', 'enable_task_manager'],
}], }],
['notifications==1', {
'grit_defines': ['-D', 'enable_notifications'],
}],
['clang_use_chrome_plugins==1 and OS!="win"', { ['clang_use_chrome_plugins==1 and OS!="win"', {
'clang_chrome_plugins_flags': [ 'clang_chrome_plugins_flags': [
'<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
......
...@@ -12905,79 +12905,77 @@ Some features may be unavailable. Please check that the profile exists and you ...@@ -12905,79 +12905,77 @@ Some features may be unavailable. Please check that the profile exists and you
</message> </message>
<!-- Desktop notifications --> <!-- Desktop notifications -->
<if expr="enable_notifications"> <message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon.">
<message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon."> Dismiss
Dismiss </message>
</message> <message name="IDS_NOTIFICATION_BALLOON_SOURCE_LABEL" desc="Text which labels the balloon with the source origin.">
<message name="IDS_NOTIFICATION_BALLOON_SOURCE_LABEL" desc="Text which labels the balloon with the source origin."> <ph name="SOURCE_ORIGIN">$1</ph>
<ph name="SOURCE_ORIGIN">$1</ph> </message>
</message> <message name="IDS_NOTIFICATION_PERMISSIONS" desc="Text requesting permission for desktop notifications.">
<message name="IDS_NOTIFICATION_PERMISSIONS" desc="Text requesting permission for desktop notifications."> Allow <ph name="site">$1<ex>mail.google.com</ex></ph> to show desktop notifications?
Allow <ph name="site">$1<ex>mail.google.com</ex></ph> to show desktop notifications? </message>
</message> <message name="IDS_NOTIFICATION_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site would like to:' in a permissions request">
<message name="IDS_NOTIFICATION_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site would like to:' in a permissions request"> show desktop notifications
show desktop notifications </message>
</message> <message name="IDS_NOTIFICATION_PERMISSION_YES" desc="The label of the 'allow' button on the notification permission infobar.">
<message name="IDS_NOTIFICATION_PERMISSION_YES" desc="The label of the 'allow' button on the notification permission infobar."> Allow
Allow </message>
</message> <message name="IDS_NOTIFICATION_PERMISSION_NO" desc="The label of the 'deny' button on the notification permission infobar.">
<message name="IDS_NOTIFICATION_PERMISSION_NO" desc="The label of the 'deny' button on the notification permission infobar."> Deny
Deny </message>
</message> <message name="IDS_NOTIFICATION_OPTIONS_MENU_LABEL" desc="Text for the menu option">
<message name="IDS_NOTIFICATION_OPTIONS_MENU_LABEL" desc="Text for the menu option"> Options
Options </message>
</message> <message name="IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE" desc="Text for the menu option to revoke notification permission.">
<message name="IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE" desc="Text for the menu option to revoke notification permission."> Disable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph>
Disable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> </message>
</message> <message name="IDS_NOTIFICATION_BALLOON_ENABLE_MESSAGE" desc="Text for the menu option to enable notification permission.">
<message name="IDS_NOTIFICATION_BALLOON_ENABLE_MESSAGE" desc="Text for the menu option to enable notification permission."> Enable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph>
Enable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> </message>
</message> <message name="IDS_NOTIFICATION_CHOOSE_POSITION" desc="Menu label for position choice submenu.">
<message name="IDS_NOTIFICATION_CHOOSE_POSITION" desc="Menu label for position choice submenu."> Choose position
Choose position </message>
</message> <message name="IDS_NOTIFICATION_POSITION_DEFAULT" desc="Menu label for positioning in default location">
<message name="IDS_NOTIFICATION_POSITION_DEFAULT" desc="Menu label for positioning in default location"> Use default
Use default </message>
</message> <message name="IDS_NOTIFICATION_POSITION_LOWER_LEFT" desc="Menu label for positioning in lower left corner">
<message name="IDS_NOTIFICATION_POSITION_LOWER_LEFT" desc="Menu label for positioning in lower left corner"> Lower left
Lower left </message>
</message> <message name="IDS_NOTIFICATION_POSITION_LOWER_RIGHT" desc="Menu label for positioning in lower right corner">
<message name="IDS_NOTIFICATION_POSITION_LOWER_RIGHT" desc="Menu label for positioning in lower right corner"> Lower right
Lower right </message>
</message> <message name="IDS_NOTIFICATION_POSITION_UPPER_LEFT" desc="Menu label for positioning in upper left corner">
<message name="IDS_NOTIFICATION_POSITION_UPPER_LEFT" desc="Menu label for positioning in upper left corner"> Upper left
Upper left </message>
</message> <message name="IDS_NOTIFICATION_POSITION_UPPER_RIGHT" desc="Menu label for positioning in upper right corner">
<message name="IDS_NOTIFICATION_POSITION_UPPER_RIGHT" desc="Menu label for positioning in upper right corner"> Upper right
Upper right </message>
</message> <message name="IDS_NOTIFICATION_WELCOME_BODY" desc="Notification body for the Welcome Notification">
<message name="IDS_NOTIFICATION_WELCOME_BODY" desc="Notification body for the Welcome Notification"> Stay connected to what you need to know, across all devices.
Stay connected to what you need to know, across all devices. </message>
</message> <message name="IDS_NOTIFICATION_WELCOME_BUTTON_LEARN_MORE" desc="Learn more button text for the Welcome Notification">
<message name="IDS_NOTIFICATION_WELCOME_BUTTON_LEARN_MORE" desc="Learn more button text for the Welcome Notification"> Learn more
Learn more </message>
</message> <message name="IDS_NOTIFICATION_WELCOME_DISPLAY_SOURCE" desc="Display source for the Welcome Notification">
<message name="IDS_NOTIFICATION_WELCOME_DISPLAY_SOURCE" desc="Display source for the Welcome Notification"> Notifications
Notifications </message>
</message> <message name="IDS_NOTIFICATION_WELCOME_TITLE" desc="Notification title for the Welcome Notification">
<message name="IDS_NOTIFICATION_WELCOME_TITLE" desc="Notification title for the Welcome Notification"> Google Now for Chrome!
Google Now for Chrome! </message>
</message> <if expr="is_macosx">
<if expr="is_macosx"> <message name="IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE" desc="The label in the footer of the message center tray, with the product title.">
<message name="IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE" desc="The label in the footer of the message center tray, with the product title."> <ph name="product_name">$1<ex>Chrome</ex></ph> Notifications
<ph name="product_name">$1<ex>Chrome</ex></ph> Notifications
</message>
</if>
<message name="IDS_NOTIFIER_WELCOME_TITLE" desc="Notification title for when a new notifier service is introduced.">
<ph name="service_name">$1<ex>Google+</ex></ph> notifications
</message>
<message name="IDS_NOTIFIER_WELCOME_BODY" desc="Notification body for when a new notifier service is introduced.">
Now on your desktop
</message>
<message name="IDS_NOTIFIER_WELCOME_BUTTON" desc="Notification body for when a new notifier service is introduced.">
Turn off these notifications
</message> </message>
</if> </if>
<message name="IDS_NOTIFIER_WELCOME_TITLE" desc="Notification title for when a new notifier service is introduced.">
<ph name="service_name">$1<ex>Google+</ex></ph> notifications
</message>
<message name="IDS_NOTIFIER_WELCOME_BODY" desc="Notification body for when a new notifier service is introduced.">
Now on your desktop
</message>
<message name="IDS_NOTIFIER_WELCOME_BUTTON" desc="Notification body for when a new notifier service is introduced.">
Turn off these notifications
</message>
<!-- Mac AppleScript --> <!-- Mac AppleScript -->
<if expr="is_macosx"> <if expr="is_macosx">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment