Google Git
Sign in
chromium / chromium / src / f89d2eefd2..077959a33f / .
diff --git a/DEPS b/DEPS
index 6a75b93..3622a3d9 100644
--- a/DEPS
+++ b/DEPS

@@ -78,7 +78,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': '707719ceeeec7da57f432c2f26cdfcdc6633c097',
+  'skia_revision': 'e4efc862935af8961568773973be1688c173bcbc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -643,7 +643,7 @@
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'd458ada06171a85af00367251a4ed55db7fe2018',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'f6e0b1a420a32c4795f86e286806e0fe6da0dd75', # commit position 20628
+    Var('webrtc_git') + '/src.git' + '@' + 'e1838ee1652fc4d5d5071782c1ab0fc726e4c66c', # commit position 20628
 
   'src/third_party/xdg-utils': {
       'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d',

diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index 5566c214..2a520cb6 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

@@ -247,13 +247,9 @@
         if (dialog_->is_reload()) {
           default_button = l10n_util::GetNSStringWithFixup(
               IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL);
-          other_button = l10n_util::GetNSStringWithFixup(
-              IDS_BEFORERELOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL);
         } else {
           default_button = l10n_util::GetNSStringWithFixup(
               IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL);
-          other_button = l10n_util::GetNSStringWithFixup(
-              IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL);
         }
       }
       break;

diff --git a/components/app_modal/views/javascript_app_modal_dialog_views.cc b/components/app_modal/views/javascript_app_modal_dialog_views.cc
index d66b9be..fbf8532 100644
--- a/components/app_modal/views/javascript_app_modal_dialog_views.cc
+++ b/components/app_modal/views/javascript_app_modal_dialog_views.cc

@@ -112,19 +112,10 @@
 
 base::string16 JavaScriptAppModalDialogViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  if (parent_->is_before_unload_dialog()) {
-    if (button == ui::DIALOG_BUTTON_OK) {
-      return l10n_util::GetStringUTF16(
-          parent_->is_reload() ?
-          IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL :
-          IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL);
-    }
-    if (button == ui::DIALOG_BUTTON_CANCEL) {
-      return l10n_util::GetStringUTF16(
-          parent_->is_reload() ?
-          IDS_BEFORERELOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL :
-          IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL);
-    }
+  if (button == ui::DIALOG_BUTTON_OK && parent_->is_before_unload_dialog()) {
+    return l10n_util::GetStringUTF16(
+        parent_->is_reload() ? IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL
+                             : IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL);
   }
   return DialogDelegate::GetDialogButtonLabel(button);
 }

diff --git a/components/app_modal_strings.grdp b/components/app_modal_strings.grdp
index b857eefc..a4a573c 100644
--- a/components/app_modal_strings.grdp
+++ b/components/app_modal_strings.grdp

@@ -31,7 +31,7 @@
     </message>
   </if>
   <message name="IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION" desc="Optional UI shown on the message box, in the form of a checkbox, allowing the user to suppress additional message boxes from the page.">
-    Prevent this page from creating additional dialogs.
+    Prevent this page from creating additional dialogs
   </message>
 
   <!-- "Before Unload" Dialog Box strings -->
@@ -51,9 +51,6 @@
   <message name="IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL" desc="The text on the button which navigates the user away from the page.">
     Leave
   </message>
-  <message name="IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL" desc="The text on the button which cancels the navigation away from the page.">
-    Stay
-  </message>
 
   <!-- "Before Reload" Dialog Box strings (same as "Before Unload" but when reloading rather than unloading the page -->
   <if expr="not use_titlecase">
@@ -69,8 +66,5 @@
   <message name="IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL" desc="The text on the button which reloads the page.">
     Reload
   </message>
-  <message name="IDS_BEFORERELOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL" desc="The text on the button which cancels the page reload.">
-    Don’t Reload
-  </message>
 
 </grit-part>