Rename app_strings to ui_strings.

BUG=72317 TEST=None R=rsesek@chromium.org, tony@chromium.org Review URL: http://codereview.chromium.org/7210060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91704 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Jul 7, 2011 · c32c977 · c32c977
1 parent 9b8c962
commit c32c977
Show file tree

Hide file tree

Showing 78 changed files with 255 additions and 254 deletions.
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -26,9 +26,9 @@
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
-#include "grit/app_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
@@ -11,8 +11,8 @@
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/message_box_flags.h"
 

diff --git a/chrome/browser/ui/cocoa/restart_browser.mm b/chrome/browser/ui/cocoa/restart_browser.mm
@@ -6,9 +6,9 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "grit/app_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 

diff --git a/chrome/browser/ui/cocoa/ui_localizer.mm b/chrome/browser/ui/cocoa/ui_localizer.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,11 +7,12 @@
 #import <Foundation/Foundation.h>
 
 #include <stdlib.h>
-#include "base/sys_string_conversions.h"
+
 #include "base/logging.h"
-#include "grit/app_strings.h"
+#include "base/sys_string_conversions.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 

diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {

diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -22,8 +22,8 @@
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/browser_thread.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // This function takes the output of a SaveAs dialog: a filename, a filter and

diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
@@ -62,8 +62,8 @@ def calc_inputs(locale):
   #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
   inputs.append('%s/webkit/webkit_strings_%s.pak' % (SHARE_INT_DIR, locale))
 
-  #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_strings_da.pak',
-  inputs.append('%s/ui/app_strings/app_strings_%s.pak' % (
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak',
+  inputs.append('%s/ui/ui_strings/ui_strings_%s.pak' % (
       SHARE_INT_DIR, locale))
 
   #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',

diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
@@ -147,7 +147,7 @@ def CheckForUnusedGrdIDsInSources(grd_files, src_dirs):
       os.path.join(src_dir, 'ui', 'gfx', 'gfx_resources.grd'),
       os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'),
       os.path.join(ui_base_dir, 'app_locale_settings.grd'),
-      os.path.join(ui_base_dir, 'app_strings.grd'),
+      os.path.join(ui_base_dir, 'ui_strings.grd'),
     ]
 
   # If no source directories were given, default them:

diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
@@ -81,7 +81,7 @@
     "messages": [9000],
   },
 
-  "ui/base/strings/app_strings.grd": {
+  "ui/base/strings/ui_strings.grd": {
     "messages": [9500],
   },
   # Chromium strings and Google Chrome strings must start at the same id.

diff --git a/ui/DEPS b/ui/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+grit/app_locale_settings.h",
-  "+grit/app_strings.h",
+  "+grit/ui_strings.h",
   "+net",
   "+skia",
   "+third_party/mozilla",

diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -13,7 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
 #include "googleurl/src/gurl.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/ui/base/strings/app_strings.grd → ui/base/strings/ui_strings.grd b/ui/base/strings/app_strings.grd → ui/base/strings/ui_strings.grd
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
@@ -9,10 +9,10 @@
       'type': 'none',
       'actions': [
         {
-          'action_name': 'app_strings',
+          'action_name': 'ui_strings',
           'variables': {
-            'grit_grd_file': 'app_strings.grd',
-            'grit_out_dir': '<(grit_base_out_dir)/app_strings',
+            'grit_grd_file': 'ui_strings.grd',
+            'grit_out_dir': '<(grit_base_out_dir)/ui_strings',
           },
           'includes': [ '../../../build/grit_action.gypi' ],
         },
@@ -28,7 +28,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_base_out_dir)/app_locale_settings',
-          '<(grit_base_out_dir)/app_strings',
+          '<(grit_base_out_dir)/ui_strings',
         ],
       },
       'conditions': [
@@ -51,7 +51,7 @@
             'action_name': 'repack_ui_unittest_strings',
             'variables': {
               'pak_inputs': [
-                '<(grit_base_out_dir)/app_strings/app_strings_en-US.pak',
+                '<(grit_base_out_dir)/ui_strings/ui_strings_en-US.pak',
                 '<(grit_base_out_dir)/app_locale_settings/app_locale_settings_en-US.pak',
               ],
             },

diff --git a/ui/base/strings/app_strings_am.xtb → ui/base/strings/ui_strings_am.xtb b/ui/base/strings/app_strings_am.xtb → ui/base/strings/ui_strings_am.xtb
diff --git a/ui/base/strings/app_strings_ar.xtb → ui/base/strings/ui_strings_ar.xtb b/ui/base/strings/app_strings_ar.xtb → ui/base/strings/ui_strings_ar.xtb
diff --git a/ui/base/strings/app_strings_bg.xtb → ui/base/strings/ui_strings_bg.xtb b/ui/base/strings/app_strings_bg.xtb → ui/base/strings/ui_strings_bg.xtb
diff --git a/ui/base/strings/app_strings_bn.xtb → ui/base/strings/ui_strings_bn.xtb b/ui/base/strings/app_strings_bn.xtb → ui/base/strings/ui_strings_bn.xtb
diff --git a/ui/base/strings/app_strings_ca.xtb → ui/base/strings/ui_strings_ca.xtb b/ui/base/strings/app_strings_ca.xtb → ui/base/strings/ui_strings_ca.xtb
diff --git a/ui/base/strings/app_strings_cs.xtb → ui/base/strings/ui_strings_cs.xtb b/ui/base/strings/app_strings_cs.xtb → ui/base/strings/ui_strings_cs.xtb
diff --git a/ui/base/strings/app_strings_da.xtb → ui/base/strings/ui_strings_da.xtb b/ui/base/strings/app_strings_da.xtb → ui/base/strings/ui_strings_da.xtb
diff --git a/ui/base/strings/app_strings_de.xtb → ui/base/strings/ui_strings_de.xtb b/ui/base/strings/app_strings_de.xtb → ui/base/strings/ui_strings_de.xtb
diff --git a/ui/base/strings/app_strings_el.xtb → ui/base/strings/ui_strings_el.xtb b/ui/base/strings/app_strings_el.xtb → ui/base/strings/ui_strings_el.xtb
diff --git a/ui/base/strings/app_strings_en-GB.xtb → ui/base/strings/ui_strings_en-GB.xtb b/ui/base/strings/app_strings_en-GB.xtb → ui/base/strings/ui_strings_en-GB.xtb
diff --git a/ui/base/strings/app_strings_es-419.xtb → ui/base/strings/ui_strings_es-419.xtb b/ui/base/strings/app_strings_es-419.xtb → ui/base/strings/ui_strings_es-419.xtb
diff --git a/ui/base/strings/app_strings_es.xtb → ui/base/strings/ui_strings_es.xtb b/ui/base/strings/app_strings_es.xtb → ui/base/strings/ui_strings_es.xtb
diff --git a/ui/base/strings/app_strings_et.xtb → ui/base/strings/ui_strings_et.xtb b/ui/base/strings/app_strings_et.xtb → ui/base/strings/ui_strings_et.xtb
diff --git a/ui/base/strings/app_strings_fa.xtb → ui/base/strings/ui_strings_fa.xtb b/ui/base/strings/app_strings_fa.xtb → ui/base/strings/ui_strings_fa.xtb
diff --git a/ui/base/strings/app_strings_fi.xtb → ui/base/strings/ui_strings_fi.xtb b/ui/base/strings/app_strings_fi.xtb → ui/base/strings/ui_strings_fi.xtb
diff --git a/ui/base/strings/app_strings_fil.xtb → ui/base/strings/ui_strings_fil.xtb b/ui/base/strings/app_strings_fil.xtb → ui/base/strings/ui_strings_fil.xtb
diff --git a/ui/base/strings/app_strings_fr.xtb → ui/base/strings/ui_strings_fr.xtb b/ui/base/strings/app_strings_fr.xtb → ui/base/strings/ui_strings_fr.xtb
diff --git a/ui/base/strings/app_strings_gu.xtb → ui/base/strings/ui_strings_gu.xtb b/ui/base/strings/app_strings_gu.xtb → ui/base/strings/ui_strings_gu.xtb
diff --git a/ui/base/strings/app_strings_hi.xtb → ui/base/strings/ui_strings_hi.xtb b/ui/base/strings/app_strings_hi.xtb → ui/base/strings/ui_strings_hi.xtb
diff --git a/ui/base/strings/app_strings_hr.xtb → ui/base/strings/ui_strings_hr.xtb b/ui/base/strings/app_strings_hr.xtb → ui/base/strings/ui_strings_hr.xtb
diff --git a/ui/base/strings/app_strings_hu.xtb → ui/base/strings/ui_strings_hu.xtb b/ui/base/strings/app_strings_hu.xtb → ui/base/strings/ui_strings_hu.xtb
diff --git a/ui/base/strings/app_strings_id.xtb → ui/base/strings/ui_strings_id.xtb b/ui/base/strings/app_strings_id.xtb → ui/base/strings/ui_strings_id.xtb
diff --git a/ui/base/strings/app_strings_it.xtb → ui/base/strings/ui_strings_it.xtb b/ui/base/strings/app_strings_it.xtb → ui/base/strings/ui_strings_it.xtb
diff --git a/ui/base/strings/app_strings_iw.xtb → ui/base/strings/ui_strings_iw.xtb b/ui/base/strings/app_strings_iw.xtb → ui/base/strings/ui_strings_iw.xtb
diff --git a/ui/base/strings/app_strings_ja.xtb → ui/base/strings/ui_strings_ja.xtb b/ui/base/strings/app_strings_ja.xtb → ui/base/strings/ui_strings_ja.xtb
diff --git a/ui/base/strings/app_strings_kn.xtb → ui/base/strings/ui_strings_kn.xtb b/ui/base/strings/app_strings_kn.xtb → ui/base/strings/ui_strings_kn.xtb
diff --git a/ui/base/strings/app_strings_ko.xtb → ui/base/strings/ui_strings_ko.xtb b/ui/base/strings/app_strings_ko.xtb → ui/base/strings/ui_strings_ko.xtb
diff --git a/ui/base/strings/app_strings_lt.xtb → ui/base/strings/ui_strings_lt.xtb b/ui/base/strings/app_strings_lt.xtb → ui/base/strings/ui_strings_lt.xtb
diff --git a/ui/base/strings/app_strings_lv.xtb → ui/base/strings/ui_strings_lv.xtb b/ui/base/strings/app_strings_lv.xtb → ui/base/strings/ui_strings_lv.xtb
diff --git a/ui/base/strings/app_strings_ml.xtb → ui/base/strings/ui_strings_ml.xtb b/ui/base/strings/app_strings_ml.xtb → ui/base/strings/ui_strings_ml.xtb
diff --git a/ui/base/strings/app_strings_mr.xtb → ui/base/strings/ui_strings_mr.xtb b/ui/base/strings/app_strings_mr.xtb → ui/base/strings/ui_strings_mr.xtb
diff --git a/ui/base/strings/app_strings_nl.xtb → ui/base/strings/ui_strings_nl.xtb b/ui/base/strings/app_strings_nl.xtb → ui/base/strings/ui_strings_nl.xtb
diff --git a/ui/base/strings/app_strings_no.xtb → ui/base/strings/ui_strings_no.xtb b/ui/base/strings/app_strings_no.xtb → ui/base/strings/ui_strings_no.xtb
diff --git a/ui/base/strings/app_strings_pl.xtb → ui/base/strings/ui_strings_pl.xtb b/ui/base/strings/app_strings_pl.xtb → ui/base/strings/ui_strings_pl.xtb
diff --git a/ui/base/strings/app_strings_pt-BR.xtb → ui/base/strings/ui_strings_pt-BR.xtb b/ui/base/strings/app_strings_pt-BR.xtb → ui/base/strings/ui_strings_pt-BR.xtb
diff --git a/ui/base/strings/app_strings_pt-PT.xtb → ui/base/strings/ui_strings_pt-PT.xtb b/ui/base/strings/app_strings_pt-PT.xtb → ui/base/strings/ui_strings_pt-PT.xtb
diff --git a/ui/base/strings/app_strings_ro.xtb → ui/base/strings/ui_strings_ro.xtb b/ui/base/strings/app_strings_ro.xtb → ui/base/strings/ui_strings_ro.xtb
diff --git a/ui/base/strings/app_strings_ru.xtb → ui/base/strings/ui_strings_ru.xtb b/ui/base/strings/app_strings_ru.xtb → ui/base/strings/ui_strings_ru.xtb
diff --git a/ui/base/strings/app_strings_sk.xtb → ui/base/strings/ui_strings_sk.xtb b/ui/base/strings/app_strings_sk.xtb → ui/base/strings/ui_strings_sk.xtb
diff --git a/ui/base/strings/app_strings_sl.xtb → ui/base/strings/ui_strings_sl.xtb b/ui/base/strings/app_strings_sl.xtb → ui/base/strings/ui_strings_sl.xtb
diff --git a/ui/base/strings/app_strings_sr.xtb → ui/base/strings/ui_strings_sr.xtb b/ui/base/strings/app_strings_sr.xtb → ui/base/strings/ui_strings_sr.xtb
diff --git a/ui/base/strings/app_strings_sv.xtb → ui/base/strings/ui_strings_sv.xtb b/ui/base/strings/app_strings_sv.xtb → ui/base/strings/ui_strings_sv.xtb
diff --git a/ui/base/strings/app_strings_sw.xtb → ui/base/strings/ui_strings_sw.xtb b/ui/base/strings/app_strings_sw.xtb → ui/base/strings/ui_strings_sw.xtb
diff --git a/ui/base/strings/app_strings_ta.xtb → ui/base/strings/ui_strings_ta.xtb b/ui/base/strings/app_strings_ta.xtb → ui/base/strings/ui_strings_ta.xtb
diff --git a/ui/base/strings/app_strings_te.xtb → ui/base/strings/ui_strings_te.xtb b/ui/base/strings/app_strings_te.xtb → ui/base/strings/ui_strings_te.xtb
diff --git a/ui/base/strings/app_strings_th.xtb → ui/base/strings/ui_strings_th.xtb b/ui/base/strings/app_strings_th.xtb → ui/base/strings/ui_strings_th.xtb
diff --git a/ui/base/strings/app_strings_tr.xtb → ui/base/strings/ui_strings_tr.xtb b/ui/base/strings/app_strings_tr.xtb → ui/base/strings/ui_strings_tr.xtb
diff --git a/ui/base/strings/app_strings_uk.xtb → ui/base/strings/ui_strings_uk.xtb b/ui/base/strings/app_strings_uk.xtb → ui/base/strings/ui_strings_uk.xtb
diff --git a/ui/base/strings/app_strings_vi.xtb → ui/base/strings/ui_strings_vi.xtb b/ui/base/strings/app_strings_vi.xtb → ui/base/strings/ui_strings_vi.xtb
diff --git a/ui/base/strings/app_strings_zh-CN.xtb → ui/base/strings/ui_strings_zh-CN.xtb b/ui/base/strings/app_strings_zh-CN.xtb → ui/base/strings/ui_strings_zh-CN.xtb
diff --git a/ui/base/strings/app_strings_zh-TW.xtb → ui/base/strings/ui_strings_zh-TW.xtb b/ui/base/strings/app_strings_zh-TW.xtb → ui/base/strings/ui_strings_zh-TW.xtb
diff --git a/ui/base/text/bytes_formatting.cc b/ui/base/text/bytes_formatting.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ui {

diff --git a/ui/views/events/accelerator.cc b/ui/views/events/accelerator.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ui {

diff --git a/views/DEPS b/views/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+grit/app_strings.h",
   "+grit/ui_resources.h",
+  "+grit/ui_strings.h",
   "+skia/ext",
   "+net",
   "+ui",

diff --git a/views/accelerator.cc b/views/accelerator.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace views {

diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
@@ -7,7 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"

diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
@@ -5,8 +5,8 @@
 #include "views/controls/button/menu_button.h"
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
 #include "grit/ui_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
@@ -7,7 +7,7 @@
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"

diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
@@ -7,7 +7,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"

diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -13,7 +13,7 @@
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/range/range.h"

diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
@@ -11,7 +11,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"

diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
@@ -5,8 +5,8 @@
 #include "views/window/custom_frame_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
 #include "grit/ui_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"

diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
@@ -15,7 +15,7 @@
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"