chromeos: Merge ash_chromeos_strings.grdp into ash_strings.grd

ash/common/accelerators/accelerator_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/accelerators/accelerator_table.h"
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "base/macros.h"
 
 namespace ash {
@@ skipping 166 matching lines @@
 // 2- Add an entry for it in the following |kDeprecatedAccelerators| list.
 // 3- Add another entry in the |kDeprecatedAcceleratorsData|.
 // 4- That entry should contain the following:
 //    - The action that the deprecated accelerator maps to.
 //    - Define a histogram for this action in |histograms.xml| in the form
 //      "Ash.Accelerators.Deprecated.{ActionName}" and include the name of this
 //      histogram in this entry. This name will be used as the ID of the
 //      notification to be shown to the user. This is to prevent duplication of
 //      same notification.
 //    - The ID of the localized notification message to give the users telling
-//      them about the deprecation (Add one in |ash_chromeos_strings.grdp|.
-//      Search for the comment <!-- Deprecated Accelerators Messages -->).
+//      them about the deprecation (Add one in |ash_strings.grd|. Search for
+//      the comment <!-- Deprecated Accelerators Messages -->).
 //    - The IDs of the localized old and new shortcut text to be used to fill
-//      the notification text. Also found in |ash_chromeos_strings.grdp|.
+//      the notification text. Also found in |ash_strings.grd|.
 //    - {true or false} whether the deprecated accelerator is still enabled (we
 //      don't disable a deprecated accelerator abruptly).
 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file
 //    keyboard_overlay_data.js.
 const AcceleratorData kDeprecatedAccelerators[] = {
     {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN},
     {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}};
 
 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators);
 
@@ skipping 293 matching lines @@
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash