Move app/resources/* to ui/resources/ directory.

BUG=72317
TEST=None

R=rsesek@chromium.org

Review URL: http://codereview.chromium.org/7253057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91010 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 30 insertions, 30 deletions

diff --git a/views/DEPS b/views/DEPS
index 8a29af8..35b6f34 100644
--- a/views/DEPS
+++ b/views/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+app",
   "+grit/app_strings.h",
-  "+grit/app_resources.h",
+  "+grit/ui_resources.h",
   "+skia/ext",
   "+net",
   "+ui",
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 3c8bbed..89ab71a 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -6,7 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.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/button/text_button.cc b/views/controls/button/text_button.cc
index bb9defc..8189afc 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
diff --git a/views/controls/menu/menu_config_gtk.cc b/views/controls/menu/menu_config_gtk.cc
index 37a2b00..c55fa91 100644
--- a/views/controls/menu/menu_config_gtk.cc
+++ b/views/controls/menu/menu_config_gtk.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 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.
 
 #include "views/controls/menu/menu_config.h"
 
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/views/controls/menu/menu_image_util_gtk.cc b/views/controls/menu/menu_image_util_gtk.cc
index b59d666..e2e3bfb 100644
--- a/views/controls/menu/menu_image_util_gtk.cc
+++ b/views/controls/menu/menu_image_util_gtk.cc
@@ -5,7 +5,7 @@
 #include "views/controls/menu/menu_image_util_gtk.h"
 
 #include "base/i18n/rtl.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 22e3d72..9ff9ca1 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -5,7 +5,7 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index e750f0b..34f20a8 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2006-2008 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.
 
 #include "views/controls/throbber.h"
 
 #include "base/time.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index b71bf5f..91b9512 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/win/win_util.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index 434ca3e..5c17cd1 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
diff --git a/views/examples/button_example.cc b/views/examples/button_example.cc
index 4dcb73e..e929858 100644
--- a/views/examples/button_example.cc
+++ b/views/examples/button_example.cc
@@ -4,7 +4,7 @@
 
 #include "views/examples/button_example.h"
 
-#include "grit/app_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/checkbox.h"
 #include "views/layout/fill_layout.h"
diff --git a/views/views.gyp b/views/views.gyp
index 73a8fcd..7ac9d79 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -61,7 +61,6 @@
       'target_name': 'views',
       'type': 'static_library',
       'dependencies': [
-        '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
@@ -71,6 +70,7 @@
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/gfx/compositor/compositor.gyp:compositor',
         '../ui/ui.gyp:ui_base',
+        '../ui/ui.gyp:ui_resources',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
@@ -471,7 +471,6 @@
       'target_name': 'views_unittests',
       'type': 'executable',
       'dependencies': [
-        '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
@@ -480,6 +479,7 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/ui.gyp:ui_resources',
         'views',
       ],
       'include_dirs': [
@@ -516,7 +516,7 @@
         'widget/native_widget_unittest.cc',
         'widget/native_widget_win_unittest.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -564,13 +564,13 @@
       'target_name': 'views_examples',
       'type': 'executable',
       'dependencies': [
-        '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/ui.gyp:ui_gfx',
         '../ui/ui.gyp:gfx_resources',
+        '../ui/ui.gyp:ui_resources',
         'views',
       ],
       'include_dirs': [
@@ -615,8 +615,8 @@
         'examples/widget_example.h',
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
-        '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -654,14 +654,14 @@
       'target_name': 'views_desktop_lib',
       'type': 'static_library',
       'dependencies': [
-        '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        'views',
-        '../ui/ui.gyp:ui_gfx',
         '../ui/ui.gyp:gfx_resources',
+        '../ui/ui.gyp:ui_gfx',
+        '../ui/ui.gyp:ui_resources',
+        'views',
       ],
       'include_dirs': [
         '..',
@@ -700,21 +700,21 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
-      ],      
+      ],
     },
     {
       'target_name': 'views_desktop',
       'type': 'executable',
       'dependencies': [
-        '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
+        '../ui/ui.gyp:gfx_resources',
+        '../ui/ui.gyp:ui_gfx',
+        '../ui/ui.gyp:ui_resources',
         'views',
         'views_desktop_lib',
-        '../ui/ui.gyp:ui_gfx',
-        '../ui/ui.gyp:gfx_resources',
       ],
       'include_dirs': [
         '..',
@@ -723,8 +723,8 @@
         'desktop/desktop_main.cc',
         'desktop/desktop_views_delegate.cc',
         'desktop/desktop_views_delegate.h',
-        '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index ff59913..8de6072 100644
--- 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_resources.h"
 #include "grit/app_strings.h"
+#include "grit/ui_resources.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/window_shape.h b/views/window/window_shape.h
index 0fadc87..e65bc2b 100644
--- a/views/window/window_shape.h
+++ b/views/window/window_shape.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -14,9 +14,9 @@ class Path;
 namespace views {
 
 // Sets the window mask to a style that most likely matches
-// app/resources/window_*
+// ui/resources/window_*
 void GetDefaultWindowMask(const gfx::Size& size, gfx::Path* window_mask);
 
 } // namespace views
 
-#endif  // #ifndef VIEWS_WINDOW_WINDOW_SHAPE_H_
+#endif  // VIEWS_WINDOW_WINDOW_SHAPE_H_