diff options
71 files changed, 89 insertions, 24 deletions
diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd index 1525701..2f9f577 100644 --- a/app/resources/app_resources.grd +++ b/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> diff --git a/app/resources/app_top_center.png b/app/resources/app_top_center.png Binary files differnew file mode 100644 index 0000000..46f8f96 --- /dev/null +++ b/app/resources/app_top_center.png diff --git a/app/resources/app_top_left.png b/app/resources/app_top_left.png Binary files differnew file mode 100644 index 0000000..78dc306f --- /dev/null +++ b/app/resources/app_top_left.png diff --git a/app/resources/app_top_right.png b/app/resources/app_top_right.png Binary files differnew file mode 100644 index 0000000..df3b9a3 --- /dev/null +++ b/app/resources/app_top_right.png diff --git a/app/resources/close.png b/app/resources/close.png Binary files differnew file mode 100644 index 0000000..6217569 --- /dev/null +++ b/app/resources/close.png diff --git a/app/resources/close_h.png b/app/resources/close_h.png Binary files differnew file mode 100644 index 0000000..9921435 --- /dev/null +++ b/app/resources/close_h.png diff --git a/app/resources/close_p.png b/app/resources/close_p.png Binary files differnew file mode 100644 index 0000000..0487e4a --- /dev/null +++ b/app/resources/close_p.png diff --git a/app/resources/close_sa.png b/app/resources/close_sa.png Binary files differnew file mode 100644 index 0000000..12ae813 --- /dev/null +++ b/app/resources/close_sa.png diff --git a/app/resources/close_sa_h.png b/app/resources/close_sa_h.png Binary files differnew file mode 100644 index 0000000..d5a7a42 --- /dev/null +++ b/app/resources/close_sa_h.png diff --git a/app/resources/close_sa_p.png b/app/resources/close_sa_p.png Binary files differnew file mode 100644 index 0000000..c1d7c91 --- /dev/null +++ b/app/resources/close_sa_p.png diff --git a/app/resources/content_bottom_center.png b/app/resources/content_bottom_center.png Binary files differnew file mode 100644 index 0000000..efce9cf --- /dev/null +++ b/app/resources/content_bottom_center.png diff --git a/app/resources/content_bottom_left_corner.png b/app/resources/content_bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..db7b04f --- /dev/null +++ b/app/resources/content_bottom_left_corner.png diff --git a/app/resources/content_bottom_right_corner.png b/app/resources/content_bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..d4c0136 --- /dev/null +++ b/app/resources/content_bottom_right_corner.png diff --git a/app/resources/content_left_side.png b/app/resources/content_left_side.png Binary files differnew file mode 100644 index 0000000..93bc64b --- /dev/null +++ b/app/resources/content_left_side.png diff --git a/app/resources/content_right_side.png b/app/resources/content_right_side.png Binary files differnew file mode 100644 index 0000000..598858b --- /dev/null +++ b/app/resources/content_right_side.png diff --git a/app/resources/default_favicon.png b/app/resources/default_favicon.png Binary files differnew file mode 100644 index 0000000..a0aec4a --- /dev/null +++ b/app/resources/default_favicon.png diff --git a/app/resources/folder_closed.png b/app/resources/folder_closed.png Binary files differnew file mode 100644 index 0000000..746fab9 --- /dev/null +++ b/app/resources/folder_closed.png diff --git a/app/resources/folder_closed_rtl.png b/app/resources/folder_closed_rtl.png Binary files differnew file mode 100644 index 0000000..dbd0b0a --- /dev/null +++ b/app/resources/folder_closed_rtl.png diff --git a/app/resources/folder_open.png b/app/resources/folder_open.png Binary files differnew file mode 100644 index 0000000..3276810 --- /dev/null +++ b/app/resources/folder_open.png diff --git a/app/resources/folder_open_rtl.png b/app/resources/folder_open_rtl.png Binary files differnew file mode 100644 index 0000000..9ba7069 --- /dev/null +++ b/app/resources/folder_open_rtl.png diff --git a/app/resources/input_alert.png b/app/resources/input_alert.png Binary files differnew file mode 100644 index 0000000..503a545 --- /dev/null +++ b/app/resources/input_alert.png diff --git a/app/resources/input_good.png b/app/resources/input_good.png Binary files differnew file mode 100644 index 0000000..1646cd5 --- /dev/null +++ b/app/resources/input_good.png diff --git a/app/resources/input_unknown.png b/app/resources/input_unknown.png Binary files differnew file mode 100644 index 0000000..0a5484d --- /dev/null +++ b/app/resources/input_unknown.png diff --git a/app/resources/maximize.png b/app/resources/maximize.png Binary files differnew file mode 100644 index 0000000..5fb89e2 --- /dev/null +++ b/app/resources/maximize.png diff --git a/app/resources/maximize_h.png b/app/resources/maximize_h.png Binary files differnew file mode 100644 index 0000000..ab326b1 --- /dev/null +++ b/app/resources/maximize_h.png diff --git a/app/resources/maximize_p.png b/app/resources/maximize_p.png Binary files differnew file mode 100644 index 0000000..6c92c75 --- /dev/null +++ b/app/resources/maximize_p.png diff --git a/app/resources/menu_droparrow.png b/app/resources/menu_droparrow.png Binary files differnew file mode 100644 index 0000000..8aef68b --- /dev/null +++ b/app/resources/menu_droparrow.png diff --git a/app/resources/minimize.png b/app/resources/minimize.png Binary files differnew file mode 100644 index 0000000..fe0ab2f --- /dev/null +++ b/app/resources/minimize.png diff --git a/app/resources/minimize_h.png b/app/resources/minimize_h.png Binary files differnew file mode 100644 index 0000000..6bceb24 --- /dev/null +++ b/app/resources/minimize_h.png diff --git a/app/resources/minimize_p.png b/app/resources/minimize_p.png Binary files differnew file mode 100644 index 0000000..62b2f77 --- /dev/null +++ b/app/resources/minimize_p.png diff --git a/app/resources/restore.png b/app/resources/restore.png Binary files differnew file mode 100644 index 0000000..bb70f2d --- /dev/null +++ b/app/resources/restore.png diff --git a/app/resources/restore_h.png b/app/resources/restore_h.png Binary files differnew file mode 100644 index 0000000..96851ef --- /dev/null +++ b/app/resources/restore_h.png diff --git a/app/resources/restore_p.png b/app/resources/restore_p.png Binary files differnew file mode 100644 index 0000000..96851ef --- /dev/null +++ b/app/resources/restore_p.png diff --git a/app/resources/textbutton_b_h.png b/app/resources/textbutton_b_h.png Binary files differnew file mode 100644 index 0000000..169db96 --- /dev/null +++ b/app/resources/textbutton_b_h.png diff --git a/app/resources/textbutton_b_p.png b/app/resources/textbutton_b_p.png Binary files differnew file mode 100644 index 0000000..f1fb512 --- /dev/null +++ b/app/resources/textbutton_b_p.png diff --git a/app/resources/textbutton_bl_h.png b/app/resources/textbutton_bl_h.png Binary files differnew file mode 100644 index 0000000..f45f0e8 --- /dev/null +++ b/app/resources/textbutton_bl_h.png diff --git a/app/resources/textbutton_bl_p.png b/app/resources/textbutton_bl_p.png Binary files differnew file mode 100644 index 0000000..06712be --- /dev/null +++ b/app/resources/textbutton_bl_p.png diff --git a/app/resources/textbutton_br_h.png b/app/resources/textbutton_br_h.png Binary files differnew file mode 100644 index 0000000..e8f3b1f --- /dev/null +++ b/app/resources/textbutton_br_h.png diff --git a/app/resources/textbutton_br_p.png b/app/resources/textbutton_br_p.png Binary files differnew file mode 100644 index 0000000..a84c385 --- /dev/null +++ b/app/resources/textbutton_br_p.png diff --git a/app/resources/textbutton_c_h.png b/app/resources/textbutton_c_h.png Binary files differnew file mode 100644 index 0000000..6188590 --- /dev/null +++ b/app/resources/textbutton_c_h.png diff --git a/app/resources/textbutton_c_p.png b/app/resources/textbutton_c_p.png Binary files differnew file mode 100644 index 0000000..2925888 --- /dev/null +++ b/app/resources/textbutton_c_p.png diff --git a/app/resources/textbutton_l_h.png b/app/resources/textbutton_l_h.png Binary files differnew file mode 100644 index 0000000..4e3b7ab --- /dev/null +++ b/app/resources/textbutton_l_h.png diff --git a/app/resources/textbutton_l_p.png b/app/resources/textbutton_l_p.png Binary files differnew file mode 100644 index 0000000..8641049 --- /dev/null +++ b/app/resources/textbutton_l_p.png diff --git a/app/resources/textbutton_r_h.png b/app/resources/textbutton_r_h.png Binary files differnew file mode 100644 index 0000000..946c5ef --- /dev/null +++ b/app/resources/textbutton_r_h.png diff --git a/app/resources/textbutton_r_p.png b/app/resources/textbutton_r_p.png Binary files differnew file mode 100644 index 0000000..e4f7f34 --- /dev/null +++ b/app/resources/textbutton_r_p.png diff --git a/app/resources/textbutton_t_h.png b/app/resources/textbutton_t_h.png Binary files differnew file mode 100644 index 0000000..11285e0 --- /dev/null +++ b/app/resources/textbutton_t_h.png diff --git a/app/resources/textbutton_t_p.png b/app/resources/textbutton_t_p.png Binary files differnew file mode 100644 index 0000000..c212b4f --- /dev/null +++ b/app/resources/textbutton_t_p.png diff --git a/app/resources/textbutton_tl_h.png b/app/resources/textbutton_tl_h.png Binary files differnew file mode 100644 index 0000000..51208bc --- /dev/null +++ b/app/resources/textbutton_tl_h.png diff --git a/app/resources/textbutton_tl_p.png b/app/resources/textbutton_tl_p.png Binary files differnew file mode 100644 index 0000000..6422023 --- /dev/null +++ b/app/resources/textbutton_tl_p.png diff --git a/app/resources/textbutton_tr_h.png b/app/resources/textbutton_tr_h.png Binary files differnew file mode 100644 index 0000000..f07e92ff --- /dev/null +++ b/app/resources/textbutton_tr_h.png diff --git a/app/resources/textbutton_tr_p.png b/app/resources/textbutton_tr_p.png Binary files differnew file mode 100644 index 0000000..ab87ec6 --- /dev/null +++ b/app/resources/textbutton_tr_p.png diff --git a/app/resources/theme_frame_default.png b/app/resources/theme_frame_default.png Binary files differnew file mode 100644 index 0000000..3f4f7e9 --- /dev/null +++ b/app/resources/theme_frame_default.png diff --git a/app/resources/theme_frame_default_inactive.png b/app/resources/theme_frame_default_inactive.png Binary files differnew file mode 100644 index 0000000..a1eff41 --- /dev/null +++ b/app/resources/theme_frame_default_inactive.png diff --git a/app/resources/throbber.png b/app/resources/throbber.png Binary files differnew file mode 100644 index 0000000..6ca1fdd --- /dev/null +++ b/app/resources/throbber.png diff --git a/app/resources/window_bottom_center.png b/app/resources/window_bottom_center.png Binary files differnew file mode 100644 index 0000000..3fb76f1 --- /dev/null +++ b/app/resources/window_bottom_center.png diff --git a/app/resources/window_bottom_left_corner.png b/app/resources/window_bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..1d3c066 --- /dev/null +++ b/app/resources/window_bottom_left_corner.png diff --git a/app/resources/window_bottom_right_corner.png b/app/resources/window_bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..83cf5b9 --- /dev/null +++ b/app/resources/window_bottom_right_corner.png diff --git a/app/resources/window_left_side.png b/app/resources/window_left_side.png Binary files differnew file mode 100644 index 0000000..2553d1b --- /dev/null +++ b/app/resources/window_left_side.png diff --git a/app/resources/window_right_side.png b/app/resources/window_right_side.png Binary files differnew file mode 100644 index 0000000..c89b47b --- /dev/null +++ b/app/resources/window_right_side.png diff --git a/app/resources/window_top_center.png b/app/resources/window_top_center.png Binary files differnew file mode 100644 index 0000000..e2c393e --- /dev/null +++ b/app/resources/window_top_center.png diff --git a/app/resources/window_top_left_corner.png b/app/resources/window_top_left_corner.png Binary files differnew file mode 100644 index 0000000..4bb52ce --- /dev/null +++ b/app/resources/window_top_left_corner.png diff --git a/app/resources/window_top_right_corner.png b/app/resources/window_top_right_corner.png Binary files differnew file mode 100644 index 0000000..d1da9ca --- /dev/null +++ b/app/resources/window_top_right_corner.png @@ -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", ] diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index fdb28c0..b7e1f8f 100644 --- a/views/controls/button/menu_button.cc +++ b/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" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 9bf9e24..e468e9e 100644 --- a/views/controls/button/text_button.cc +++ b/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 { diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc index 680b623..ecc3033 100644 --- a/views/controls/scroll_view.cc +++ b/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" diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc index e15fcb3..2a4e324 100644 --- a/views/controls/throbber.cc +++ b/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; diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index ceaa461..4aebad7 100644 --- a/views/controls/tree/tree_view.cc +++ b/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" diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 17ba99b..009fc47 100644 --- a/views/drag_utils.cc +++ b/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 { diff --git a/views/views.gyp b/views/views.gyp index 2165a52..dff1b66 100644 --- a/views/views.gyp +++ b/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', - ], }], ], }, diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 35ecb6b..e8fdb0f 100644 --- a/views/window/custom_frame_view.cc +++ b/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" |
