Parts of my previous changelist didn't make it through.

http://crbug.com/11387


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

app/resources/app_resources.grd

@@ -10,6 +10,84 @@
   <release seq="1">
     <includes>
 
+      <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" />
+
+      <!-- Window Controls -->
+      <include name="IDR_CLOSE" file="close.png" type="BINDATA" />
+      <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
+      <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
+      <include name="IDR_RESTORE" file="restore.png" type="BINDATA" />
+      <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
+      <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
+
+      <!-- Frame Theme Images -->
+      <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
+      <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
+
+      <!-- Frame Edge Images -->
+      <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
+
+      <!-- Frame Client Edge Images -->
+      <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" />
+      <include name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" />
+
+      <!-- Throbber -->
+      <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" />
+
+      <!-- Input Validation -->
+      <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" />
+      <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
+
+      <!-- Folder Icons -->
+      <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" />
+
+      <!-- Toolbar Button highlights -->
+      <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" />
+
+      <!-- Menus -->
+      <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" />
     </includes>
   </release>
 </grit>

views/DEPS

@@ -1,7 +1,6 @@
 include_rules = [
   "+app",
   "+grit/app_strings.h",
-  # TODO(beng): swap these with app/views specific generated resources.
-  "+grit/theme_resources.h",
+  "+grit/app_resources.h",
   "+skia/ext",
 ]

views/controls/button/menu_button.cc

@@ -10,7 +10,7 @@
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
 #include "grit/app_strings.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"

views/controls/button/text_button.cc

@@ -10,7 +10,7 @@
 #include "app/resource_bundle.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 
 namespace views {
 

views/controls/scroll_view.cc

@@ -6,7 +6,6 @@
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
-#include "grit/theme_resources.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/root_view.h"
 

views/controls/throbber.cc

@@ -7,7 +7,7 @@
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;

views/controls/tree/tree_view.cc

@@ -15,7 +15,7 @@
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 

views/drag_utils.cc

@@ -18,7 +18,7 @@
 #include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 #include "views/controls/button/text_button.h"
 
 namespace drag_utils {

views/views.gyp

@@ -44,6 +44,7 @@
       'dependencies': [
         '../app/app.gyp:app_base',      
         '../app/app.gyp:app_strings',      
+        '../app/app.gyp:app_resources',      
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
@@ -214,6 +215,9 @@
       ],
       'conditions': [
         ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
           'sources!': [
             'accelerator.cc',
             'accessibility/accessible_wrapper.cc',
@@ -257,14 +261,6 @@
             'window/native_frame_view.cc',
             'widget/widget_win.cc',
           ],
-          # TODO: Move these dependencies to platform-neutral once these
-          # projects are generated by GYP.
-          'dependencies': [
-            '../chrome/chrome.gyp:chrome_resources',
-            '../chrome/chrome.gyp:chrome_strings',
-            '../chrome/chrome.gyp:theme_resources',
-            '../build/linux/system.gyp:gtk',
-          ],
         }],
         ['OS=="win"', {
           'defines': [
@@ -276,13 +272,6 @@
             # TODO(beng): move wtl to src/third_party
             '../chrome/third_party/wtl/include',
           ],
-          # TODO: remove this when chrome_resources/chrome_strings are
-          #       generated by GYP.
-          # The legacy vcproj we rely on places the grit output in this
-          # directory, so we need to explicitly add it to our include path.
-          'include_dirs': [
-            '<(PRODUCT_DIR)/grit_derived_sources',
-          ],
         }],
       ],
     },

views/window/custom_frame_view.cc

@@ -13,7 +13,7 @@
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"