Issue 2725403002: Revert of Add new sad tab strings.

sclittle

The CQ bit was checked by sclittle@chromium.org

3 years, 9 months ago (2017-03-03 21:23:57 UTC) #1

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2725403002/1

3 years, 9 months ago (2017-03-03 21:24:34 UTC) #3

commit-bot: I haz the power

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

3 years, 9 months ago (2017-03-03 21:26:43 UTC) #4

commit-bot: I haz the power

Failed to apply patch for components/new_or_sad_tab_strings.grdp: While running git apply --index -p1; error: patch failed: ...

3 years, 9 months ago (2017-03-03 21:26:45 UTC) #5

Failed to apply patch for components/new_or_sad_tab_strings.grdp:
While running git apply --index -p1;
  error: patch failed: components/new_or_sad_tab_strings.grdp:36
  error: components/new_or_sad_tab_strings.grdp: patch does not apply

Patch:       components/new_or_sad_tab_strings.grdp
Index: components/new_or_sad_tab_strings.grdp
diff --git a/components/new_or_sad_tab_strings.grdp
b/components/new_or_sad_tab_strings.grdp
index
0d208f7af1fa8e352da90979195d9c25c80f0a51..b140dcdb58affd3b26928aa232af6a1f722d52b8
100644
--- a/components/new_or_sad_tab_strings.grdp
+++ b/components/new_or_sad_tab_strings.grdp
@@ -36,81 +36,6 @@
           Send Feedback
         </message>
       </if>
-      <if expr="is_win">
-        <message name="IDS_SAD_TAB_OOM_TITLE" desc="The title of the web page
displayed if content in Chrome browser does not load due to the browser being
out of memory, and a reload failed to fix the issue.">
-          Not enough memory to open this page
-        </message>
-      </if>
-      <message name="IDS_SAD_TAB_RELOAD_TITLE" desc="The title of the web page
displayed if content in Chrome browser does not load for an unknown reason, and
a reload failed to fix the issue." formatter_data="android_java">
-        Can't open this page
-      </message>
-      <message name="IDS_SAD_TAB_OOM_MESSAGE_TABS" desc="The message displayed
on the web page if content in Chrome browser does not load due to the browser
being out of memory, a reload failed to fix the issue and other tabs are open."
formatter_data="android_java">
-        Try closing other tabs or programs to free up memory.
-      </message>
-      <message name="IDS_SAD_TAB_OOM_MESSAGE_NOTABS" desc="The message
displayed on the web page if content in Chrome browser does not load due to the
browser being out of memory, a reload failed to fix the issue and no other tabs
are open." formatter_data="android_java">
-        Try exiting other programs to free up memory.
-      </message>
-      <message name="IDS_SAD_TAB_RELOAD_TRY" desc="The message displayed on the
web page if content in Chrome browser does not load and a reload failed to fix
the issue. Introduces a bulleted list of solutions/tips for the user to try."
formatter_data="android_java">
-        Try the following tips:
-      </message>
-      <if expr="is_macosx">
-        <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to open the web page in Chrome's Incognito mode."
formatter_data="android_java">
-          Open page in Incognito mode (⇧⌘N)
-        </message>
-      </if>
-      <if expr="is_win or is_linux or chromeos">
-        <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to open the web page in Chrome's Incognito mode."
formatter_data="android_java">
-          Open page in Incognito mode (Ctrl-Shift-N)
-        </message>
-      </if>
-      <if expr="is_android or is_ios">
-        <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to open the web page in Chrome's Incognito mode."
formatter_data="android_java">
-          Open page in Incognito mode
-        </message>
-      </if>
-      <if expr="is_macosx or chromeos">
-        <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to close other Chrome tabs or apps running on their computer (Mac,
Chrome OS)." formatter_data="android_java">
-          Close other tabs or apps
-        </message>
-      </if>
-      <if expr="is_linux">
-        <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to close other Chrome tabs or programs running on their computer."
formatter_data="android_java">
-          Close other tabs or programs
-        </message>
-      </if>
-      <if expr="is_macosx or chromeos or is_android or is_ios">
-        <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to close other apps running on their computer or device."
formatter_data="android_java">
-          Close other apps
-        </message>
-      </if>
-      <if expr="is_linux">
-        <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet
points displayed on the web page if a reload failed to fix the issue, advising
the user to close other programs running on their computer (Linux)."
formatter_data="android_java">
-          Close other programs
-        </message>
-      </if>
-      <if expr="_google_chrome">
-        <message name="IDS_SAD_TAB_RELOAD_RESTART_BROWSER" desc="One of the
bullet points displayed on the web page if a reload failed to fix the issue,
advising the user to restart Chrome." formatter_data="android_java">
-          Restart Chrome
-        </message>
-      </if>
-      <if expr="not _google_chrome">
-        <message name="IDS_SAD_TAB_RELOAD_RESTART_BROWSER" desc="One of the
bullet points displayed on the web page if a reload failed to fix the issue,
advising the user to restart Chromium." formatter_data="android_java">
-          Restart Chromium
-        </message>
-      </if>
-      <if expr="is_win or is_linux or is_maxosx or chromeos">
-        <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the
bullet points displayed on the web page if a reload failed to fix the issue,
advising the user to restart their computer." formatter_data="android_java">
-          Restart your computer
-        </message>
-      </if>
-      <if expr="is_android or is_ios">
-        <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the
bullet points displayed on the web page if a reload failed to fix the issue,
advising the user to restart their device (i.e. phone or tablet)."
formatter_data="android_java">
-          Restart your device
-        </message>
-      </if>
-      <message name="IDS_SAD_TAB_UMA_OPTIN" desc="Text that appears next to a
checkbox, allowing the user to opt-in to sending statistics about their Chrome
browser usage and reports of crashes to Google." formatter_data="android_java">
-        Automatically send usage statistics and crash reports to Google
-      </message>
 
       <!-- New Tab -->
       <message name="IDS_NEW_TAB_TITLE"

sclittle

3 years, 9 months ago (2017-03-03 21:32:23 UTC) #6

Looks like this CL lost the race - Another revert was created and landed right
around the same time: https://codereview.chromium.org/2727913007/

Closing this issue.

sclittle

3 years, 9 months ago (2017-03-03 21:32:29 UTC) #7

Description was changed from

==========
Revert of Add new sad tab strings. (patchset #4 id:60001 of
https://codereview.chromium.org/2730903006/ )

Reason for revert:
Looks like this broke compilation on ChromiumOS builders. I'm reverting this to
fix the builders.

E.g.:

https://uberchromegw.corp.google.com/i/chromium.chromiumos/builders/Linux%20C...

https://uberchromegw.corp.google.com/i/chromium.chromiumos/builders/Linux%20C...

Original issue's description:
> Add new sad tab strings.
> 
> These are being added before branch point so they can be localized.
> 
> Code will follow.
> 
> BUG=697259
> 
> Review-Url: https://codereview.chromium.org/2730903006
> Cr-Commit-Position: refs/heads/master@{#454667}
> Committed:
https://chromium.googlesource.com/chromium/src/+/a8206e24e0758e349d1708fab7aa...

TBR=sdefresne@chromium.org,yyushkina@chromium.org,srahim@google.com,wfh@chrom...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=697259
==========

to

==========
Revert of Add new sad tab strings. (patchset #4 id:60001 of
https://codereview.chromium.org/2730903006/ )

Reason for revert:
Looks like this broke compilation on ChromiumOS builders. I'm reverting this to
fix the builders.

E.g.:

https://uberchromegw.corp.google.com/i/chromium.chromiumos/builders/Linux%20C...

https://uberchromegw.corp.google.com/i/chromium.chromiumos/builders/Linux%20C...

Original issue's description:
> Add new sad tab strings.
> 
> These are being added before branch point so they can be localized.
> 
> Code will follow.
> 
> BUG=697259
> 
> Review-Url: https://codereview.chromium.org/2730903006
> Cr-Commit-Position: refs/heads/master@{#454667}
> Committed:
https://chromium.googlesource.com/chromium/src/+/a8206e24e0758e349d1708fab7aa...

TBR=sdefresne@chromium.org,yyushkina@chromium.org,srahim@google.com,wfh@chrom...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=697259
==========

Issue 2725403002: Revert of Add new sad tab strings. (Closed)

Description

Patch Set 1 #

Messages