Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(951)

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 569643003: Fix l10n_util DCHECK on OSX quitting with more than one download in progress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/app_controller_mac.h" 5 #import "chrome/browser/app_controller_mac.h"
6 6
7 #include "apps/app_shim/extension_app_shim_handler_mac.h" 7 #include "apps/app_shim/extension_app_shim_handler_mac.h"
8 #include "base/auto_reset.h" 8 #include "base/auto_reset.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 820
821 // Set the dialog text based on whether or not there are multiple downloads. 821 // Set the dialog text based on whether or not there are multiple downloads.
822 if (downloadCount == 1) { 822 if (downloadCount == 1) {
823 // Dialog text: warning and explanation. 823 // Dialog text: warning and explanation.
824 titleText = l10n_util::GetNSString( 824 titleText = l10n_util::GetNSString(
825 IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE); 825 IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE);
826 explanationText = l10n_util::GetNSString( 826 explanationText = l10n_util::GetNSString(
827 IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION); 827 IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
828 } else { 828 } else {
829 // Dialog text: warning and explanation. 829 // Dialog text: warning and explanation.
830 titleText = l10n_util::GetNSStringF( 830 titleText = l10n_util::GetNSString(
831 IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE, 831 IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE);
832 base::IntToString16(downloadCount));
833 explanationText = l10n_util::GetNSString( 832 explanationText = l10n_util::GetNSString(
834 IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION); 833 IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
835 } 834 }
836 // Cancel download and exit button text. 835 // Cancel download and exit button text.
837 exitTitle = l10n_util::GetNSString( 836 exitTitle = l10n_util::GetNSString(
838 IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL); 837 IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
839 838
840 // Wait for download button text. 839 // Wait for download button text.
841 waitTitle = l10n_util::GetNSString( 840 waitTitle = l10n_util::GetNSString(
842 IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL); 841 IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 1579
1581 //--------------------------------------------------------------------------- 1580 //---------------------------------------------------------------------------
1582 1581
1583 namespace app_controller_mac { 1582 namespace app_controller_mac {
1584 1583
1585 bool IsOpeningNewWindow() { 1584 bool IsOpeningNewWindow() {
1586 return g_is_opening_new_window; 1585 return g_is_opening_new_window;
1587 } 1586 }
1588 1587
1589 } // namespace app_controller_mac 1588 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698