Commit 32064a74 authored by sdefresne's avatar sdefresne Committed by Commit bot

Componentize IDS_SESSION_CRASHED_* to allow sharing with iOS.

BUG=568486

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

Cr-Commit-Position: refs/heads/master@{#376136}
parent e5ca870c
...@@ -184,9 +184,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> ...@@ -184,9 +184,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
<message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window"> <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window">
Task Manager - Chromium Task Manager - Chromium
</message> </message>
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Chromium didn't shut down correctly.
</message>
<message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble."> <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
</message> </message>
......
...@@ -6850,9 +6850,6 @@ Keep your key file in a safe place. You will need it to create new versions of y ...@@ -6850,9 +6850,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
<!-- Session Crashed Info Bar/Bubble--> <!-- Session Crashed Info Bar/Bubble-->
<message name="IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON" desc="Title of the restore button in the session crashed view.">
Restore
</message>
<message name="IDS_SESSION_CRASHED_BUBBLE_TITLE" desc="Title of the session crashed bubble view."> <message name="IDS_SESSION_CRASHED_BUBBLE_TITLE" desc="Title of the session crashed bubble view.">
Restore pages? Restore pages?
</message> </message>
......
...@@ -186,9 +186,6 @@ chromium_strings.grd. --> ...@@ -186,9 +186,6 @@ chromium_strings.grd. -->
<message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window"> <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window">
Task Manager - Google Chrome Task Manager - Google Chrome
</message> </message>
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Chrome didn't shut down correctly.
</message>
<message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble."> <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
Help make Google Chrome better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google Help make Google Chrome better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
</message> </message>
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
#include "chrome/grit/chromium_strings.h" #include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_google_chrome_strings.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/dom_storage_context.h" #include "content/public/browser/dom_storage_context.h"
#include "content/public/browser/storage_partition.h" #include "content/public/browser/storage_partition.h"
#include "grit/theme_resources.h" #include "grit/theme_resources.h"
......
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
#include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/google_update_settings.h"
#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_google_chrome_strings.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_source.h"
......
...@@ -224,6 +224,10 @@ ...@@ -224,6 +224,10 @@
<message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something."> <message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something.">
You are viewing a secure Chromium page. You are viewing a secure Chromium page.
</message> </message>
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Chromium didn't shut down correctly.
</message>
</messages> </messages>
</release> </release>
</grit> </grit>
...@@ -224,6 +224,10 @@ ...@@ -224,6 +224,10 @@
<message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something."> <message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something.">
You are viewing a secure Google Chrome page. You are viewing a secure Google Chrome page.
</message> </message>
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Chrome didn't shut down correctly.
</message>
</messages> </messages>
</release> </release>
</grit> </grit>
...@@ -269,6 +269,10 @@ ...@@ -269,6 +269,10 @@
<message name="IDS_UTILITY_PROCESS_JSON_PARSER_NAME" desc="The name of the utility process used for parsing JSON files."> <message name="IDS_UTILITY_PROCESS_JSON_PARSER_NAME" desc="The name of the utility process used for parsing JSON files.">
JSON Parser JSON Parser
</message> </message>
<message name="IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON" desc="Title of the restore button in the session crashed view.">
Restore
</message>
</messages> </messages>
</release> </release>
</grit> </grit>
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