| Index: chrome/browser/ui/apps/apps_metro_handler_win.cc
|
| diff --git a/chrome/browser/ui/apps/apps_metro_handler_win.cc b/chrome/browser/ui/apps/apps_metro_handler_win.cc
|
| index 4a50ba29d895815a606b97ff0090ad0a69f430b9..f01cc37858295628b7466629edd080969ebfd0c3 100644
|
| --- a/chrome/browser/ui/apps/apps_metro_handler_win.cc
|
| +++ b/chrome/browser/ui/apps/apps_metro_handler_win.cc
|
| @@ -12,18 +12,28 @@
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| -bool VerifyMetroSwitchForApps(gfx::NativeWindow parent_window,
|
| - int win8_restart_command_id) {
|
| - DCHECK(win8_restart_command_id == IDC_WIN8_DESKTOP_RESTART ||
|
| - win8_restart_command_id == IDC_WIN8_METRO_RESTART);
|
| +bool VerifyASHSwitchForApps(gfx::NativeWindow parent_window,
|
| + int win_restart_command_id) {
|
| + DCHECK(win_restart_command_id == IDC_WIN_DESKTOP_RESTART ||
|
| + win_restart_command_id == IDC_WIN8_METRO_RESTART ||
|
| + win_restart_command_id == IDC_WIN_ASH_RESTART);
|
| if (!apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(
|
| apps::AppWindow::WINDOW_TYPE_DEFAULT)) {
|
| return true;
|
| }
|
|
|
| - int string_id = win8_restart_command_id == IDC_WIN8_METRO_RESTART ?
|
| - IDS_WIN8_PROMPT_TO_CLOSE_APPS_FOR_METRO :
|
| - IDS_WIN8_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP;
|
| + int string_id = 0;
|
| + switch (win_restart_command_id) {
|
| + case IDC_WIN8_METRO_RESTART:
|
| + string_id = IDS_WIN8_PROMPT_TO_CLOSE_APPS_FOR_METRO;
|
| + break;
|
| + case IDC_WIN_ASH_RESTART:
|
| + string_id = IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_ASH;
|
| + break;
|
| + default:
|
| + string_id = IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP;
|
| + break;
|
| + }
|
| chrome::MessageBoxResult result = chrome::ShowMessageBox(
|
| parent_window,
|
| l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
|
|
|