diff options
Diffstat (limited to 'chrome')
74 files changed, 515 insertions, 808 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index febe854..39d78ef 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -723,6 +723,7 @@ p.AddConfig('Release|Win32', # TODO(sgk): move to separate .scons file for browser_resources ############# sconscript_files = [ + 'app/theme/SConscript', 'browser/views/SConscript', 'views/SConscript', ] @@ -734,7 +735,6 @@ if not env.WantSystemLib('hunspell'): if env.Bit('windows'): sconscript_files.extend([ 'app/resources/SConscript', - 'app/theme/SConscript', ]) env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test']) diff --git a/chrome/browser/resources/browser_resources.vcproj b/chrome/app/chrome_resources.vcproj index 67bb42f..003219a 100644 --- a/chrome/browser/resources/browser_resources.vcproj +++ b/chrome/app/chrome_resources.vcproj @@ -2,9 +2,9 @@ <VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="browser_resources"
+ Name="chrome_resources"
ProjectGUID="{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}"
- RootNamespace="browser_resources"
+ RootNamespace="chrome_resources"
Keyword="Win32Proj"
>
<Platforms>
@@ -14,7 +14,7 @@ </Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\..\..\tools\grit\build\grit_resources.rules"
+ RelativePath="..\..\tools\grit\build\grit_resources.rules"
/>
</ToolFiles>
<Configurations>
@@ -27,10 +27,8 @@ Name="VCPreBuildEventTool"
/>
<Tool
- Name="WebKitVersion"
- />
- <Tool
Name="GRIT Generated Resources"
+ PreprocessorDefinitions="$(CHROMIUM_BUILD)"
/>
<Tool
Name="VCCustomBuildTool"
@@ -51,9 +49,6 @@ Name="VCPreBuildEventTool"
/>
<Tool
- Name="WebKitVersion"
- />
- <Tool
Name="GRIT Generated Resources"
/>
<Tool
@@ -72,15 +67,22 @@ <Files>
<Filter
Name="Generated Files"
- SourceControlFiles="false"
>
<File
RelativePath="$(OutDir)\grit_derived_sources\browser_resources.h"
>
</File>
+ <File
+ RelativePath="$(OutDir)\grit_derived_sources\theme_resources.h"
+ >
+ </File>
</Filter>
<File
- RelativePath="..\browser_resources.grd"
+ RelativePath="..\browser\browser_resources.grd"
+ >
+ </File>
+ <File
+ RelativePath="theme\theme_resources.grd"
>
</File>
</Files>
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript index a70a944..34ebf75 100644 --- a/chrome/app/theme/SConscript +++ b/chrome/app/theme/SConscript @@ -12,83 +12,92 @@ env_res.Append( '.', '$CHROME_SRC_DIR', ], - RCFLAGS = [ - ['/l', '0x409'], - ], ) +if env.Bit('windows'): + env_res.Append( + RCFLAGS = [ + ['/l', '0x409'], + ], + ) -env.Append( - LINKFLAGS = [ - '/INCREMENTAL:NO', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', + env.Append( + LINKFLAGS = [ + '/INCREMENTAL:NO', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', - '/NOENTRY', - '/BASE:"0x3CE00000"', - '/MACHINE:X86', - '/FIXED:No', + '/NOENTRY', + '/BASE:"0x3CE00000"', + '/MACHINE:X86', + '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +# TODO(tc): We need to pass in a preprocessor define for official builds. +generated = env.GRIT( + '$TARGET_ROOT/grit_derived_sources/fake_theme_target', + '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd') -input_files = ChromeFileList([ - 'theme_resources.h', - 'theme_resources.rc', - 'distribution_resources.rc', -]) +if env.Bit('windows'): + input_files = ChromeFileList([ + '$TARGET_ROOT/grit_derived_sources/theme_resources.rc', + ]) -res = [] -res.extend(env_res.RES('theme_resources.rc')) -res.extend(env_res.RES('distribution_resources.rc')) + # TODO(tc): This causes scons to die because the regular expression that + # scans .rc files for dependencies overflows (see + # SCons/Tool/Scanner/RC.py). Disable it for now because it's only for the + # Windows build. + #res = env.RES('$TARGET_ROOT/grit_derived_sources/theme_resources.rc') -themes_default = env.ChromeSharedLibrary("default", res) -env.Install("$DESTINATION_ROOT/themes", themes_default) + #themes_default = env.ChromeSharedLibrary("default", res) + #env.Install("$DESTINATION_ROOT/themes", themes_default) -p = env.ChromeMSVSProject('theme_dll.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'app/theme/theme_dll.vcproj'), - guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='2') + p = env.ChromeMSVSProject('theme_dll.vcproj', + dest=('$CHROME_SRC_DIR/chrome/' + + 'app/theme/theme_dll.vcproj'), + guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLinkerTool', + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='2') -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './theme_dll.vsprops', - ]) + p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/debug.vsprops', + './theme_dll.vsprops', + ]) -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './theme_dll.vsprops', - ]) + p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/release.vsprops', + './theme_dll.vsprops', + ]) diff --git a/chrome/app/theme/distribution_resources.rc b/chrome/app/theme/distribution_resources.rc deleted file mode 100644 index b265faa..0000000 --- a/chrome/app/theme/distribution_resources.rc +++ /dev/null @@ -1,28 +0,0 @@ -// Resources used by common/*.
-//
-// Paths in this file are relative to the current file.
-
-#include "theme_resources.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// data resources
-//
-
-#if defined(GOOGLE_CHROME_BUILD)
-IDR_ABOUT_BACKGROUND BINDATA "google_chrome/about_background.png"
-IDR_ABOUT_BACKGROUND_RTL BINDATA "google_chrome/about_background_rtl.png"
-IDR_ABOUT_BACKGROUND_COLOR BINDATA "google_chrome/about_background_color.png"
-IDR_DISTRIBUTOR_LOGO BINDATA "google_chrome/distributor_logo.png"
-IDR_DISTRIBUTOR_LOGO_LIGHT BINDATA "google_chrome/distributor_logo_light.png"
-IDR_PRODUCT_LOGO BINDATA "google_chrome/product_logo.png"
-IDR_WIZARD_ICON BINDATA "google_chrome/wizard_icon.png"
-IDR_WIZARD_ICON_RTL BINDATA "google_chrome/wizard_icon_rtl.png"
-#else
-IDR_ABOUT_BACKGROUND BINDATA "chromium/about_background.png"
-IDR_ABOUT_BACKGROUND_RTL BINDATA "chromium/about_background_rtl.png"
-IDR_ABOUT_BACKGROUND_COLOR BINDATA "chromium/about_background_color.png"
-IDR_PRODUCT_LOGO BINDATA "chromium/product_logo.png"
-IDR_WIZARD_ICON BINDATA "chromium/wizard_icon.png"
-IDR_WIZARD_ICON_RTL BINDATA "chromium/wizard_icon_rtl.png"
-#endif
diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj index a0e2bf9..1ec5d14 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -140,15 +140,7 @@ </References> <Files> <File - RelativePath="theme_resources.h" - > - </File> - <File - RelativePath="theme_resources.rc" - > - </File> - <File - RelativePath="distribution_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc" > </File> </Files> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd new file mode 100755 index 0000000..c346cf9 --- /dev/null +++ b/chrome/app/theme/theme_resources.grd @@ -0,0 +1,330 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+ <outputs>
+ <output filename="theme_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="theme_resources.rc" type="rc_all" /> + <output filename="theme_resources.pak" type="data_package" /> + </outputs>
+ <release seq="1">
+ <includes>
+ <include name="IDR_BACK" file="back.png" type="BINDATA" />
+ <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
+ <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
+ <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON" file="star_small.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA" />
+ <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_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" />
+ <include name="IDR_CONTENT_STAR_D" file="content_star_d.png" type="BINDATA" />
+ <include name="IDR_CONTENT_STAR_OFF" file="content_star_off.png" type="BINDATA" />
+ <include name="IDR_CONTENT_STAR_ON" file="content_star_on.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" />
+ <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" />
+ <include name="IDR_DROP" file="drop.png" type="BINDATA" />
+ <include name="IDR_DROP_H" file="drop_h.png" type="BINDATA" />
+ <include name="IDR_DROP_P" file="drop_p.png" type="BINDATA" />
+ <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_FORWARD" file="forward.png" type="BINDATA" />
+ <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
+ <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
+ <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
+ <include name="IDR_GO" file="go.png" type="BINDATA" />
+ <include name="IDR_GO_H" file="go_h.png" type="BINDATA" />
+ <include name="IDR_GO_P" file="go_p.png" type="BINDATA" />
+ <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG" file="locationbg.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="location_bar_keyword_search_c.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="location_bar_keyword_search_l.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="location_bar_keyword_search_r.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" />
+ <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
+ <include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
+ <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
+ <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
+ <include name="IDR_STAR" file="star.png" type="BINDATA" />
+ <include name="IDR_STAR_D" file="star_d.png" type="BINDATA" />
+ <include name="IDR_STAR_H" file="star_h.png" type="BINDATA" />
+ <include name="IDR_STAR_P" file="star_p.png" type="BINDATA" />
+ <include name="IDR_STARRED" file="starred.png" type="BINDATA" />
+ <include name="IDR_STARRED_H" file="starred_h.png" type="BINDATA" />
+ <include name="IDR_STARRED_P" file="starred_p.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_LEFT_OTR" file="tab_inactive_left_otr.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_CENTER_OTR" file="tab_inactive_center_otr.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_RIGHT_OTR" file="tab_inactive_right_otr.png" type="BINDATA" />
+ <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" />
+ <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" />
+ <include name="IDR_WINDOW_BOTTOM_CENTER_OTR" file="window_bottom_center_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR" file="window_bottom_left_corner_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR" file="window_bottom_right_corner_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_LEFT_SIDE_OTR" file="window_left_side_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_RIGHT_SIDE_OTR" file="window_right_side_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_TOP_CENTER_OTR" file="window_top_center_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_TOP_LEFT_CORNER_OTR" file="window_top_left_corner_otr.png" type="BINDATA" />
+ <include name="IDR_WINDOW_TOP_RIGHT_CORNER_OTR" file="window_top_right_corner_otr.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_CENTER_V" file="tab_inactive_center_v.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_LEFT_V" file="tab_inactive_left_v.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_RIGHT_V" file="tab_inactive_right_v.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_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_BOTTOM_CENTER_OTR" file="dewindow_bottom_center_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR" file="dewindow_bottom_left_corner_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR" file="dewindow_bottom_right_corner_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_LEFT_SIDE_OTR" file="dewindow_left_side_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_RIGHT_SIDE_OTR" file="dewindow_right_side_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_CENTER_OTR" file="dewindow_top_center_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_LEFT_CORNER_OTR" file="dewindow_top_left_corner_otr.png" type="BINDATA" />
+ <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR" file="dewindow_top_right_corner_otr.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM" file="download_button_center_bottom.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H" file="download_button_center_bottom_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P" file="download_button_center_bottom_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE" file="download_button_center_middle.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_H" file="download_button_center_middle_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_P" file="download_button_center_middle_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_TOP" file="download_button_center_top.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_TOP_H" file="download_button_center_top_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_CENTER_TOP_P" file="download_button_center_top_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM" file="download_button_left_bottom.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_H" file="download_button_left_bottom_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_P" file="download_button_left_bottom_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE" file="download_button_left_middle.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_H" file="download_button_left_middle_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_P" file="download_button_left_middle_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_TOP" file="download_button_left_top.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_TOP_H" file="download_button_left_top_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_LEFT_TOP_P" file="download_button_left_top_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_BOTTOM" file="download_button_menu_bottom.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_H" file="download_button_menu_bottom_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_P" file="download_button_menu_bottom_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_MIDDLE" file="download_button_menu_middle.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_H" file="download_button_menu_middle_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_P" file="download_button_menu_middle_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_TOP" file="download_button_menu_top.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_TOP_H" file="download_button_menu_top_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_MENU_TOP_P" file="download_button_menu_top_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM" file="download_button_right_bottom.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_H" file="download_button_right_bottom_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_P" file="download_button_right_bottom_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_NO_DD" file="download_button_right_bottom_no_dd.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE" file="download_button_right_middle.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_H" file="download_button_right_middle_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_P" file="download_button_right_middle_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_NO_DD" file="download_button_right_middle_no_dd.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP" file="download_button_right_top.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H" file="download_button_right_top_h.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P" file="download_button_right_top_p.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="download_button_right_top_no_dd.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="download_progress_background16.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="download_progress_foreground16.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_ICON" file="download_icon.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_CENTER" file="constrained_bottom_center.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER" file="constrained_bottom_left_corner.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER" file="constrained_bottom_right_corner.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_LEFT_SIDE" file="constrained_left_side.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_RIGHT_SIDE" file="constrained_right_side.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_CENTER" file="constrained_top_center.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER" file="constrained_top_left_corner.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER" file="constrained_top_right_corner.png" type="BINDATA" />
+ <include name="IDR_FIND_BOX_BACKGROUND" file="find_box_bg.png" type="BINDATA" />
+ <include name="IDR_FIND_BOX_BACKGROUND_LEFT" file="find_box_bg_left.png" type="BINDATA" />
+ <include name="IDR_FIND_BOX_BACKGROUND_LEFT_RTL" file="find_box_bg_left_rtl.png" type="BINDATA" />
+ <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_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
+ <include name="IDR_LOCK" file="lock_small.png" type="BINDATA" />
+ <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" />
+ <include name="IDR_THROBBER_01" file="vista_frame_throbber_01.ico" type="ICON" />
+ <include name="IDR_THROBBER_02" file="vista_frame_throbber_02.ico" type="ICON" />
+ <include name="IDR_THROBBER_03" file="vista_frame_throbber_03.ico" type="ICON" />
+ <include name="IDR_THROBBER_04" file="vista_frame_throbber_04.ico" type="ICON" />
+ <include name="IDR_THROBBER_05" file="vista_frame_throbber_05.ico" type="ICON" />
+ <include name="IDR_THROBBER_06" file="vista_frame_throbber_06.ico" type="ICON" />
+ <include name="IDR_THROBBER_07" file="vista_frame_throbber_07.ico" type="ICON" />
+ <include name="IDR_THROBBER_08" file="vista_frame_throbber_08.ico" type="ICON" />
+ <include name="IDR_THROBBER_09" file="vista_frame_throbber_09.ico" type="ICON" />
+ <include name="IDR_THROBBER_10" file="vista_frame_throbber_10.ico" type="ICON" />
+ <include name="IDR_THROBBER_11" file="vista_frame_throbber_11.ico" type="ICON" />
+ <include name="IDR_THROBBER_12" file="vista_frame_throbber_12.ico" type="ICON" />
+ <include name="IDR_THROBBER_13" file="vista_frame_throbber_13.ico" type="ICON" />
+ <include name="IDR_THROBBER_14" file="vista_frame_throbber_14.ico" type="ICON" />
+ <include name="IDR_THROBBER_15" file="vista_frame_throbber_15.ico" type="ICON" />
+ <include name="IDR_THROBBER_16" file="vista_frame_throbber_16.ico" type="ICON" />
+ <include name="IDR_THROBBER_17" file="vista_frame_throbber_17.ico" type="ICON" />
+ <include name="IDR_THROBBER_18" file="vista_frame_throbber_18.ico" type="ICON" />
+ <include name="IDR_THROBBER_19" file="vista_frame_throbber_19.ico" type="ICON" />
+ <include name="IDR_THROBBER_20" file="vista_frame_throbber_20.ico" type="ICON" />
+ <include name="IDR_THROBBER_21" file="vista_frame_throbber_21.ico" type="ICON" />
+ <include name="IDR_THROBBER_22" file="vista_frame_throbber_22.ico" type="ICON" />
+ <include name="IDR_THROBBER_23" file="vista_frame_throbber_23.ico" type="ICON" />
+ <include name="IDR_THROBBER_24" file="vista_frame_throbber_24.ico" type="ICON" />
+ <include name="IDR_STOP" file="stop.png" type="BINDATA" />
+ <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
+ <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_LEFT_BACKGROUND" file="find_dlg_left_bg.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="find_dlg_middle_bg.png" type="BINDATA" />
+ <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" />
+ <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
+ <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" />
+ <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" />
+ <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
+ <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bottom_right_corner_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" type="BINDATA" />
+ <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab.png" type="BINDATA" />
+ <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
+ <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" />
+ <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_PREV" file="find_prev.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_PREV_H" file="find_prev_h.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_PREV_P" file="find_prev_d.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" />
+ <include name="IDR_FINDINPAGE_NEXT_P" file="find_next_d.png" type="BINDATA" />
+ <include name="IDR_COOKIE_ICON" file="cookie.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" />
+ <include name="IDR_INFO_BUBBLE_CORNER_TOP_LEFT" file="bubble_corner_tl.png" type="BINDATA" />
+ <include name="IDR_INFO_BUBBLE_CORNER_TOP_RIGHT" file="bubble_corner_tr.png" type="BINDATA" />
+ <include name="IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT" file="bubble_corner_bl.png" type="BINDATA" />
+ <include name="IDR_INFO_BUBBLE_CORNER_BOTTOM_RIGHT" file="bubble_corner_br.png" type="BINDATA" />
+ <include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" />
+ <include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" />
+ <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
+ <include name="IDR_MENU_PAGE" file="menu_page.png" type="BINDATA" />
+ <include name="IDR_MENU_CHROME" file="menu_chrome.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_POPUPMODE_LEFT" file="locationbg_readonly_left.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_POPUPMODE_RIGHT" file="locationbg_readonly_right.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_HISTORY_SECTION" file="history_section.png" type="BINDATA" />
+ <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" />
+ <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" />
+ <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" />
+ <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" />
+ <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
+ <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
+ <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
+ <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+ <include name="IDR_HOME" file="home.png" type="BINDATA" />
+ <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
+ <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
+ <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" />
+ <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
+ <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
+ <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="BINDATA" />
+ <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" />
+ <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" />
+ <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" />
+ <include name="IDR_TAB_HOVER_LEFT" file="tab_hover_left.png" type="BINDATA" />
+ <include name="IDR_TAB_HOVER_CENTER" file="tab_hover_center.png" type="BINDATA" />
+ <include name="IDR_TAB_HOVER_RIGHT" file="tab_hover_right.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" />
+ <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_LEFT_BB_BACKGROUND" file="find_dlg_left_bb_bg.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_RIGHT_BB_BACKGROUND" file="find_dlg_right_bb_bg.png" type="BINDATA" />
+ <include name="IDR_FIND_DLG_MIDDLE_BB_BACKGROUND" file="find_dlg_middle_bb_bg.png" type="BINDATA" />
+ <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA" />
+ <include name="IDR_OTR_ICON_STANDALONE" file="otr_icon_standalone.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_SEARCH_ICON" file="bookmark_manager_search.png" type="BINDATA" />
+ <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" />
+
+ <if expr="pp_ifdef('_google_chrome')">
+ <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" />
+ <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_background_rtl.png" type="BINDATA" />
+ <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_background_color.png" type="BINDATA" />
+ <include name="IDR_DISTRIBUTOR_LOGO" file="google_chrome/distributor_logo.png" type="BINDATA" />
+ <include name="IDR_DISTRIBUTOR_LOGO_LIGHT" file="google_chrome/distributor_logo_light.png" type="BINDATA" />
+ <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" />
+ <include name="IDR_WIZARD_ICON" file="google_chrome/wizard_icon.png" type="BINDATA" />
+ <include name="IDR_WIZARD_ICON_RTL" file="google_chrome/wizard_icon_rtl.png" type="BINDATA" />
+ </if>
+
+ <if expr="not pp_ifdef('_google_chrome')">
+ <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png" type="BINDATA" />
+ <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background_rtl.png" type="BINDATA" />
+ <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_background_color.png" type="BINDATA" />
+ <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" />
+ <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BINDATA" />
+ <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
+ </if>
+ </includes>
+ </release>
+</grit>
diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h deleted file mode 100644 index 05f9f06..0000000 --- a/chrome/app/theme/theme_resources.h +++ /dev/null @@ -1,319 +0,0 @@ -// TODO(tc): Come up with a way to automate the generation of these -// IDs so they don't collide with other rc files. - -// NOTE: If you change an id you can use the following awk script to -// regenerate this file with no holes in the ids: -// awk '$1 != "#define"{print$0} $1 == "#define" {row++;printf "#define %-48s %d\n", $2, (row+8999)}' < theme_resources.h - -#define IDR_BACK 9000 -#define IDR_BACK_D 9001 -#define IDR_BACK_H 9002 -#define IDR_BACK_P 9003 -#define IDR_CLOSE 9004 -#define IDR_CLOSE_H 9005 -#define IDR_CLOSE_P 9006 -#define IDR_CONTENT_BOTTOM_CENTER 9007 -#define IDR_CONTENT_BOTTOM_LEFT_CORNER 9008 -#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 9009 -#define IDR_CONTENT_LEFT_SIDE 9010 -#define IDR_CONTENT_RIGHT_SIDE 9011 -#define IDR_CONTENT_TOP_CENTER 9012 -#define IDR_CONTENT_TOP_LEFT_CORNER 9013 -#define IDR_CONTENT_TOP_RIGHT_CORNER 9014 -#define IDR_DEFAULT_FAVICON 9015 -#define IDR_DROP 9016 -#define IDR_DROP_H 9017 -#define IDR_DROP_P 9018 -#define IDR_FORWARD 9019 -#define IDR_FORWARD_D 9020 -#define IDR_FORWARD_H 9021 -#define IDR_FORWARD_P 9022 -#define IDR_GO 9023 -#define IDR_GO_H 9024 -#define IDR_GO_P 9025 -#define IDR_INFO_BUBBLE_CLOSE 9026 -#define IDR_LOCATIONBG 9027 -#define IDR_MAXIMIZE 9028 -#define IDR_MAXIMIZE_H 9029 -#define IDR_MAXIMIZE_P 9030 -#define IDR_MENUITEM_CENTER_A 9031 -#define IDR_MENUITEM_CENTER_H 9032 -#define IDR_MENUITEM_LEFT_A 9033 -#define IDR_MENUITEM_LEFT_H 9034 -#define IDR_MENUITEM_RIGHT_A 9035 -#define IDR_MENUITEM_RIGHT_H 9036 -#define IDR_MINIMIZE 9037 -#define IDR_MINIMIZE_H 9038 -#define IDR_MINIMIZE_P 9039 -#define IDR_PLUGIN 9040 -#define IDR_RELOAD 9041 -#define IDR_RELOAD_H 9042 -#define IDR_RELOAD_P 9043 -#define IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C 9044 -#define IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L 9045 -#define IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R 9046 -#define IDR_STAR 9047 -#define IDR_STAR_D 9048 -#define IDR_STAR_H 9049 -#define IDR_STAR_P 9050 -#define IDR_STARRED 9051 -#define IDR_STARRED_H 9052 -#define IDR_STARRED_P 9053 -#define IDR_TAB_ACTIVE_CENTER 9054 -#define IDR_TAB_ACTIVE_LEFT 9055 -#define IDR_TAB_ACTIVE_RIGHT 9056 -#define IDR_TAB_CLOSE 9057 -#define IDR_TAB_CLOSE_H 9058 -#define IDR_TAB_CLOSE_P 9059 -#define IDR_TAB_INACTIVE_CENTER 9060 -#define IDR_TAB_INACTIVE_LEFT 9061 -#define IDR_TAB_INACTIVE_RIGHT 9062 -#define IDR_THROBBER 9063 -#define IDR_TOOLBAR_TOGGLE_KNOB 9064 -#define IDR_TOOLBAR_TOGGLE_TRACK 9065 -#define IDR_WINDOW_BOTTOM_CENTER 9066 -#define IDR_WINDOW_BOTTOM_LEFT_CORNER 9067 -#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 9068 -#define IDR_WINDOW_LEFT_SIDE 9069 -#define IDR_WINDOW_RIGHT_SIDE 9070 -#define IDR_WINDOW_TOP_CENTER 9071 -#define IDR_WINDOW_TOP_LEFT_CORNER 9072 -#define IDR_WINDOW_TOP_RIGHT_CORNER 9073 -#define IDR_WINDOW_BOTTOM_CENTER_OTR 9074 -#define IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR 9075 -#define IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR 9076 -#define IDR_WINDOW_LEFT_SIDE_OTR 9077 -#define IDR_WINDOW_RIGHT_SIDE_OTR 9078 -#define IDR_WINDOW_TOP_CENTER_OTR 9079 -#define IDR_WINDOW_TOP_LEFT_CORNER_OTR 9080 -#define IDR_WINDOW_TOP_RIGHT_CORNER_OTR 9081 -#define IDR_TAB_INACTIVE_CENTER_V 9082 -#define IDR_TAB_INACTIVE_LEFT_V 9083 -#define IDR_TAB_INACTIVE_RIGHT_V 9084 -#define IDR_RESTORE 9085 -#define IDR_RESTORE_H 9086 -#define IDR_RESTORE_P 9087 -#define IDR_DEWINDOW_BOTTOM_CENTER 9088 -#define IDR_DEWINDOW_BOTTOM_LEFT_CORNER 9089 -#define IDR_DEWINDOW_BOTTOM_RIGHT_CORNER 9090 -#define IDR_DEWINDOW_LEFT_SIDE 9091 -#define IDR_DEWINDOW_RIGHT_SIDE 9092 -#define IDR_DEWINDOW_TOP_CENTER 9093 -#define IDR_DEWINDOW_TOP_LEFT_CORNER 9094 -#define IDR_DEWINDOW_TOP_RIGHT_CORNER 9095 -#define IDR_DEWINDOW_BOTTOM_CENTER_OTR 9096 -#define IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR 9097 -#define IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR 9098 -#define IDR_DEWINDOW_LEFT_SIDE_OTR 9099 -#define IDR_DEWINDOW_RIGHT_SIDE_OTR 9100 -#define IDR_DEWINDOW_TOP_CENTER_OTR 9101 -#define IDR_DEWINDOW_TOP_LEFT_CORNER_OTR 9102 -#define IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR 9103 -#define IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM 9104 -#define IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H 9105 -#define IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P 9106 -#define IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE 9107 -#define IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_H 9108 -#define IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_P 9109 -#define IDR_DOWNLOAD_BUTTON_CENTER_TOP 9110 -#define IDR_DOWNLOAD_BUTTON_CENTER_TOP_H 9111 -#define IDR_DOWNLOAD_BUTTON_CENTER_TOP_P 9112 -#define IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM 9113 -#define IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_H 9114 -#define IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_P 9115 -#define IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE 9116 -#define IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_H 9117 -#define IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_P 9118 -#define IDR_DOWNLOAD_BUTTON_LEFT_TOP 9119 -#define IDR_DOWNLOAD_BUTTON_LEFT_TOP_H 9120 -#define IDR_DOWNLOAD_BUTTON_LEFT_TOP_P 9121 -#define IDR_DOWNLOAD_BUTTON_MENU_BOTTOM 9122 -#define IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_H 9123 -#define IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_P 9124 -#define IDR_DOWNLOAD_BUTTON_MENU_MIDDLE 9125 -#define IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_H 9126 -#define IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_P 9127 -#define IDR_DOWNLOAD_BUTTON_MENU_TOP 9128 -#define IDR_DOWNLOAD_BUTTON_MENU_TOP_H 9129 -#define IDR_DOWNLOAD_BUTTON_MENU_TOP_P 9130 -#define IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM 9131 -#define IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_H 9132 -#define IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_P 9133 -#define IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_NO_DD 9134 -#define IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE 9135 -#define IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_H 9136 -#define IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_P 9137 -#define IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_NO_DD 9138 -#define IDR_DOWNLOAD_BUTTON_RIGHT_TOP 9139 -#define IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H 9140 -#define IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P 9141 -#define IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD 9142 -#define IDR_DOWNLOAD_PROGRESS_BACKGROUND_16 9143 -#define IDR_DOWNLOAD_PROGRESS_FOREGROUND_16 9144 -#define IDR_DOWNLOAD_PROGRESS_BACKGROUND_32 9145 -#define IDR_DOWNLOAD_PROGRESS_FOREGROUND_32 9146 -#define IDR_DOWNLOAD_ICON 9147 -#define IDR_COOKIE_ICON 9148 -#define IDR_SAD_FAVICON 9149 -#define IDR_TAB_DROP_UP 9150 -#define IDR_TAB_DROP_DOWN 9151 -#define IDR_CONSTRAINED_BOTTOM_CENTER 9152 -#define IDR_CONSTRAINED_BOTTOM_LEFT_CORNER 9153 -#define IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER 9154 -#define IDR_CONSTRAINED_LEFT_SIDE 9155 -#define IDR_CONSTRAINED_RIGHT_SIDE 9156 -#define IDR_CONSTRAINED_TOP_CENTER 9157 -#define IDR_CONSTRAINED_TOP_LEFT_CORNER 9158 -#define IDR_CONSTRAINED_TOP_RIGHT_CORNER 9159 -#define IDR_FIND_BOX_BACKGROUND 9160 -#define IDR_FIND_BOX_BACKGROUND_LEFT 9161 -#define IDR_LOCK 9162 -#define IDR_WARNING 9163 -#define IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON 9164 -#define IDR_STOP 9165 -#define IDR_STOP_H 9166 -#define IDR_STOP_P 9167 -#define IDR_FIND_DLG_LEFT_BACKGROUND 9168 -#define IDR_FIND_DLG_RIGHT_BACKGROUND 9169 -#define IDR_FIND_DLG_MIDDLE_BACKGROUND 9170 -#define IDR_APP_TOP_RIGHT 9171 -#define IDR_APP_TOP_CENTER 9172 -#define IDR_APP_TOP_LEFT 9173 -#define IDR_APP_DROPARROW 9174 -#define IDR_THROBBER_01 9175 -#define IDR_THROBBER_02 9176 -#define IDR_THROBBER_03 9177 -#define IDR_THROBBER_04 9178 -#define IDR_THROBBER_05 9179 -#define IDR_THROBBER_06 9180 -#define IDR_THROBBER_07 9181 -#define IDR_THROBBER_08 9182 -#define IDR_THROBBER_09 9183 -#define IDR_THROBBER_10 9184 -#define IDR_THROBBER_11 9185 -#define IDR_THROBBER_12 9186 -#define IDR_THROBBER_13 9187 -#define IDR_THROBBER_14 9188 -#define IDR_THROBBER_15 9189 -#define IDR_THROBBER_16 9190 -#define IDR_THROBBER_17 9191 -#define IDR_THROBBER_18 9192 -#define IDR_THROBBER_19 9193 -#define IDR_THROBBER_20 9194 -#define IDR_THROBBER_21 9195 -#define IDR_THROBBER_22 9196 -#define IDR_THROBBER_23 9197 -#define IDR_THROBBER_24 9198 -#define IDR_PAGEINFO_GOOD 9199 -#define IDR_PAGEINFO_BAD 9200 -#define IDR_NEWTAB_BUTTON 9201 -#define IDR_NEWTAB_BUTTON_H 9202 -#define IDR_NEWTAB_BUTTON_P 9203 -#define IDR_ARROW_RIGHT 9204 -#define IDR_TEXTBUTTON_TOP_LEFT_H 9205 -#define IDR_TEXTBUTTON_TOP_H 9206 -#define IDR_TEXTBUTTON_TOP_RIGHT_H 9207 -#define IDR_TEXTBUTTON_LEFT_H 9208 -#define IDR_TEXTBUTTON_CENTER_H 9209 -#define IDR_TEXTBUTTON_RIGHT_H 9210 -#define IDR_TEXTBUTTON_BOTTOM_LEFT_H 9211 -#define IDR_TEXTBUTTON_BOTTOM_H 9212 -#define IDR_TEXTBUTTON_BOTTOM_RIGHT_H 9213 -#define IDR_TEXTBUTTON_TOP_LEFT_P 9214 -#define IDR_TEXTBUTTON_TOP_P 9215 -#define IDR_TEXTBUTTON_TOP_RIGHT_P 9216 -#define IDR_TEXTBUTTON_LEFT_P 9217 -#define IDR_TEXTBUTTON_CENTER_P 9218 -#define IDR_TEXTBUTTON_RIGHT_P 9219 -#define IDR_TEXTBUTTON_BOTTOM_LEFT_P 9220 -#define IDR_TEXTBUTTON_BOTTOM_P 9221 -#define IDR_TEXTBUTTON_BOTTOM_RIGHT_P 9222 -#define IDR_SAD_TAB 9223 -#define IDR_FOLDER_OPEN 9224 -#define IDR_FOLDER_CLOSED 9225 -#define IDR_OTR_ICON 9226 -#define IDR_TAB_INACTIVE_LEFT_OTR 9227 -#define IDR_TAB_INACTIVE_CENTER_OTR 9228 -#define IDR_TAB_INACTIVE_RIGHT_OTR 9229 -#define IDR_BOOKMARK_BAR_CHEVRONS 9230 -#define IDR_CONSTRAINED_BOTTOM_CENTER_V 9231 -#define IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V 9232 -#define IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V 9233 -#define IDR_CONSTRAINED_LEFT_SIDE_V 9234 -#define IDR_CONSTRAINED_RIGHT_SIDE_V 9235 -#define IDR_CONSTRAINED_TOP_CENTER_V 9236 -#define IDR_CONSTRAINED_TOP_LEFT_CORNER_V 9237 -#define IDR_CONSTRAINED_TOP_RIGHT_CORNER_V 9238 -#define IDR_CONTENT_STAR_D 9239 -#define IDR_CONTENT_STAR_OFF 9240 -#define IDR_CONTENT_STAR_ON 9241 -#define IDR_LOCATION_BAR_KEYWORD_HINT_TAB 9242 -#define IDR_ABOUT_BACKGROUND 9243 -#define IDR_FINDINPAGE_PREV 9244 -#define IDR_FINDINPAGE_PREV_H 9245 -#define IDR_FINDINPAGE_PREV_P 9246 -#define IDR_FINDINPAGE_NEXT 9247 -#define IDR_FINDINPAGE_NEXT_H 9248 -#define IDR_FINDINPAGE_NEXT_P 9249 -#define IDR_INFOBAR_RESTORE_SESSION 9250 -#define IDR_INFOBAR_SAVE_PASSWORD 9251 -#define IDR_INFOBAR_SSL_WARNING 9252 -#define IDR_INFOBAR_ALT_NAV_URL 9253 -#define IDR_INFOBAR_PLUGIN_INSTALL 9254 -#define IDR_INFO_BUBBLE_CORNER_TOP_LEFT 9255 -#define IDR_INFO_BUBBLE_CORNER_TOP_RIGHT 9256 -#define IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT 9257 -#define IDR_INFO_BUBBLE_CORNER_BOTTOM_RIGHT 9258 -#define IDR_WIZARD_ICON 9259 -#define IDR_MENU_MARKER 9260 -#define IDR_FROZEN_TAB_ICON 9261 -#define IDR_UPDATE_AVAILABLE 9262 -#define IDR_MENU_PAGE 9263 -#define IDR_MENU_CHROME 9264 -#define IDR_ABOUT_BACKGROUND_RTL 9265 -#define IDR_WIZARD_ICON_RTL 9266 -#define IDR_LOCATIONBG_POPUPMODE_LEFT 9267 -#define IDR_LOCATIONBG_POPUPMODE_CENTER 9268 -#define IDR_LOCATIONBG_POPUPMODE_RIGHT 9269 -#define IDR_CLOSE_SA 9270 -#define IDR_CLOSE_SA_H 9271 -#define IDR_CLOSE_SA_P 9272 -#define IDR_HISTORY_SECTION 9273 -#define IDR_DOWNLOADS_SECTION 9274 -#define IDR_DEFAULT_THUMBNAIL 9275 -#define IDR_THROBBER_WAITING 9276 -#define IDR_INFOBAR_PLUGIN_CRASHED 9277 -#define IDR_UPDATE_UPTODATE 9278 -#define IDR_UPDATE_FAIL 9279 -#define IDR_CLOSE_BAR 9280 -#define IDR_CLOSE_BAR_H 9281 -#define IDR_CLOSE_BAR_P 9282 -#define IDR_HOME 9283 -#define IDR_HOME_H 9284 -#define IDR_HOME_P 9285 -#define IDR_FIND_BOX_BACKGROUND_LEFT_RTL 9286 -#define IDR_INPUT_GOOD 9287 -#define IDR_INPUT_ALERT 9288 -#define IDR_HISTORY_FAVICON 9289 -#define IDR_DOWNLOADS_FAVICON 9290 -#define IDR_MENU_PAGE_RTL 9291 -#define IDR_MENU_CHROME_RTL 9292 -#define IDR_DOWNLOAD_ANIMATION_BEGIN 9293 -#define IDR_TAB_HOVER_LEFT 9294 -#define IDR_TAB_HOVER_CENTER 9295 -#define IDR_TAB_HOVER_RIGHT 9296 -#define IDR_FOLDER_CLOSED_RTL 9297 -#define IDR_FOLDER_OPEN_RTL 9298 -#define IDR_BOOKMARK_BAR_FOLDER 9299 -#define IDR_FIND_DLG_LEFT_BB_BACKGROUND 9300 -#define IDR_FIND_DLG_RIGHT_BB_BACKGROUND 9301 -#define IDR_FIND_DLG_MIDDLE_BB_BACKGROUND 9302 -#define IDR_THROBBER_LIGHT 9303 -#define IDR_OTR_ICON_STANDALONE 9304 -#define IDR_PRODUCT_LOGO 9305 -#define IDR_DISTRIBUTOR_LOGO 9306 -#define IDR_DISTRIBUTOR_LOGO_LIGHT 9307 -#define IDR_BOOKMARK_MANAGER_RECENT_ICON 9308 -#define IDR_BOOKMARK_MANAGER_SEARCH_ICON 9309 -#define IDR_MENU_DROPARROW 9310 -#define IDR_ABOUT_BACKGROUND_COLOR 9311 diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc deleted file mode 100644 index 572b5da..0000000 --- a/chrome/app/theme/theme_resources.rc +++ /dev/null @@ -1,307 +0,0 @@ -// Resources used by common/*. -// -// Paths in this file are relative to current file. - -#include "theme_resources.h" - -///////////////////////////////////////////////////////////////////////////// -// -// data resources -// - -IDR_BACK BINDATA "back.png" -IDR_BACK_D BINDATA "back_d.png" -IDR_BACK_H BINDATA "back_h.png" -IDR_BACK_P BINDATA "back_p.png" -IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON BINDATA "star_small.png" -IDR_BOOKMARK_BAR_CHEVRONS BINDATA "chevron.png" -IDR_CLOSE BINDATA "close.png" -IDR_CLOSE_H BINDATA "close_h.png" -IDR_CLOSE_P BINDATA "close_p.png" -IDR_CONTENT_BOTTOM_CENTER BINDATA "content_bottom_center.png" -IDR_CONTENT_BOTTOM_LEFT_CORNER BINDATA "content_bottom_left_corner.png" -IDR_CONTENT_BOTTOM_RIGHT_CORNER BINDATA "content_bottom_right_corner.png" -IDR_CONTENT_LEFT_SIDE BINDATA "content_left_side.png" -IDR_CONTENT_RIGHT_SIDE BINDATA "content_right_side.png" -IDR_CONTENT_STAR_D BINDATA "content_star_d.png" -IDR_CONTENT_STAR_OFF BINDATA "content_star_off.png" -IDR_CONTENT_STAR_ON BINDATA "content_star_on.png" -IDR_CONTENT_TOP_CENTER BINDATA "content_top_center.png" -IDR_CONTENT_TOP_LEFT_CORNER BINDATA "content_top_left_corner.png" -IDR_CONTENT_TOP_RIGHT_CORNER BINDATA "content_top_right_corner.png" -IDR_DEFAULT_FAVICON BINDATA "default_favicon.png" -IDR_DROP BINDATA "drop.png" -IDR_DROP_H BINDATA "drop_h.png" -IDR_DROP_P BINDATA "drop_p.png" -IDR_FOLDER_CLOSED BINDATA "folder_closed.png" -IDR_FOLDER_OPEN BINDATA "folder_open.png" -IDR_FORWARD BINDATA "forward.png" -IDR_FORWARD_D BINDATA "forward_d.png" -IDR_FORWARD_H BINDATA "forward_h.png" -IDR_FORWARD_P BINDATA "forward_p.png" -IDR_GO BINDATA "go.png" -IDR_GO_H BINDATA "go_h.png" -IDR_GO_P BINDATA "go_p.png" -IDR_INFO_BUBBLE_CLOSE BINDATA "bubble_close.png" -IDR_LOCATIONBG BINDATA "locationbg.png" -IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C BINDATA "location_bar_keyword_search_c.png" -IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L BINDATA "location_bar_keyword_search_l.png" -IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R BINDATA "location_bar_keyword_search_r.png" -IDR_MAXIMIZE BINDATA "maximize.png" -IDR_MAXIMIZE_H BINDATA "maximize_h.png" -IDR_MAXIMIZE_P BINDATA "maximize_p.png" -IDR_MINIMIZE BINDATA "minimize.png" -IDR_MINIMIZE_H BINDATA "minimize_h.png" -IDR_MINIMIZE_P BINDATA "minimize_p.png" -IDR_PLUGIN BINDATA "plugin.png" -IDR_RELOAD BINDATA "reload.png" -IDR_RELOAD_H BINDATA "reload_h.png" -IDR_RELOAD_P BINDATA "reload_p.png" -IDR_STAR BINDATA "star.png" -IDR_STAR_D BINDATA "star_d.png" -IDR_STAR_H BINDATA "star_h.png" -IDR_STAR_P BINDATA "star_p.png" -IDR_STARRED BINDATA "starred.png" -IDR_STARRED_H BINDATA "starred_h.png" -IDR_STARRED_P BINDATA "starred_p.png" -IDR_TAB_ACTIVE_CENTER BINDATA "tab_active_center.png" -IDR_TAB_ACTIVE_LEFT BINDATA "tab_active_left.png" -IDR_TAB_ACTIVE_RIGHT BINDATA "tab_active_right.png" -IDR_TAB_CLOSE BINDATA "tab_close.png" -IDR_TAB_CLOSE_H BINDATA "tab_close_h.png" -IDR_TAB_CLOSE_P BINDATA "tab_close_p.png" -IDR_TAB_INACTIVE_CENTER BINDATA "tab_inactive_center.png" -IDR_TAB_INACTIVE_LEFT BINDATA "tab_inactive_left.png" -IDR_TAB_INACTIVE_RIGHT BINDATA "tab_inactive_right.png" -IDR_TAB_INACTIVE_LEFT_OTR BINDATA "tab_inactive_left_otr.png" -IDR_TAB_INACTIVE_CENTER_OTR BINDATA "tab_inactive_center_otr.png" -IDR_TAB_INACTIVE_RIGHT_OTR BINDATA "tab_inactive_right_otr.png" -IDR_THROBBER BINDATA "throbber.png" -IDR_WINDOW_BOTTOM_CENTER BINDATA "window_bottom_center.png" -IDR_WINDOW_BOTTOM_LEFT_CORNER BINDATA "window_bottom_left_corner.png" -IDR_WINDOW_BOTTOM_RIGHT_CORNER BINDATA "window_bottom_right_corner.png" -IDR_WINDOW_LEFT_SIDE BINDATA "window_left_side.png" -IDR_WINDOW_RIGHT_SIDE BINDATA "window_right_side.png" -IDR_WINDOW_TOP_CENTER BINDATA "window_top_center.png" -IDR_WINDOW_TOP_LEFT_CORNER BINDATA "window_top_left_corner.png" -IDR_WINDOW_TOP_RIGHT_CORNER BINDATA "window_top_right_corner.png" -IDR_WINDOW_BOTTOM_CENTER_OTR BINDATA "window_bottom_center_otr.png" -IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR BINDATA "window_bottom_left_corner_otr.png" -IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR BINDATA "window_bottom_right_corner_otr.png" -IDR_WINDOW_LEFT_SIDE_OTR BINDATA "window_left_side_otr.png" -IDR_WINDOW_RIGHT_SIDE_OTR BINDATA "window_right_side_otr.png" -IDR_WINDOW_TOP_CENTER_OTR BINDATA "window_top_center_otr.png" -IDR_WINDOW_TOP_LEFT_CORNER_OTR BINDATA "window_top_left_corner_otr.png" -IDR_WINDOW_TOP_RIGHT_CORNER_OTR BINDATA "window_top_right_corner_otr.png" -IDR_TAB_INACTIVE_CENTER_V BINDATA "tab_inactive_center_v.png" -IDR_TAB_INACTIVE_LEFT_V BINDATA "tab_inactive_left_v.png" -IDR_TAB_INACTIVE_RIGHT_V BINDATA "tab_inactive_right_v.png" -IDR_RESTORE BINDATA "restore.png" -IDR_RESTORE_H BINDATA "restore_h.png" -IDR_RESTORE_P BINDATA "restore_p.png" -IDR_DEWINDOW_BOTTOM_CENTER BINDATA "dewindow_bottom_center.png" -IDR_DEWINDOW_BOTTOM_LEFT_CORNER BINDATA "dewindow_bottom_left_corner.png" -IDR_DEWINDOW_BOTTOM_RIGHT_CORNER BINDATA "dewindow_bottom_right_corner.png" -IDR_DEWINDOW_LEFT_SIDE BINDATA "dewindow_left_side.png" -IDR_DEWINDOW_RIGHT_SIDE BINDATA "dewindow_right_side.png" -IDR_DEWINDOW_TOP_CENTER BINDATA "dewindow_top_center.png" -IDR_DEWINDOW_TOP_LEFT_CORNER BINDATA "dewindow_top_left_corner.png" -IDR_DEWINDOW_TOP_RIGHT_CORNER BINDATA "dewindow_top_right_corner.png" -IDR_DEWINDOW_BOTTOM_CENTER_OTR BINDATA "dewindow_bottom_center_otr.png" -IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR BINDATA "dewindow_bottom_left_corner_otr.png" -IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR BINDATA "dewindow_bottom_right_corner_otr.png" -IDR_DEWINDOW_LEFT_SIDE_OTR BINDATA "dewindow_left_side_otr.png" -IDR_DEWINDOW_RIGHT_SIDE_OTR BINDATA "dewindow_right_side_otr.png" -IDR_DEWINDOW_TOP_CENTER_OTR BINDATA "dewindow_top_center_otr.png" -IDR_DEWINDOW_TOP_LEFT_CORNER_OTR BINDATA "dewindow_top_left_corner_otr.png" -IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR BINDATA "dewindow_top_right_corner_otr.png" -IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM BINDATA "download_button_center_bottom.png" -IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H BINDATA "download_button_center_bottom_h.png" -IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P BINDATA "download_button_center_bottom_p.png" -IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE BINDATA "download_button_center_middle.png" -IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_H BINDATA "download_button_center_middle_h.png" -IDR_DOWNLOAD_BUTTON_CENTER_MIDDLE_P BINDATA "download_button_center_middle_p.png" -IDR_DOWNLOAD_BUTTON_CENTER_TOP BINDATA "download_button_center_top.png" -IDR_DOWNLOAD_BUTTON_CENTER_TOP_H BINDATA "download_button_center_top_h.png" -IDR_DOWNLOAD_BUTTON_CENTER_TOP_P BINDATA "download_button_center_top_p.png" -IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM BINDATA "download_button_left_bottom.png" -IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_H BINDATA "download_button_left_bottom_h.png" -IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM_P BINDATA "download_button_left_bottom_p.png" -IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE BINDATA "download_button_left_middle.png" -IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_H BINDATA "download_button_left_middle_h.png" -IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE_P BINDATA "download_button_left_middle_p.png" -IDR_DOWNLOAD_BUTTON_LEFT_TOP BINDATA "download_button_left_top.png" -IDR_DOWNLOAD_BUTTON_LEFT_TOP_H BINDATA "download_button_left_top_h.png" -IDR_DOWNLOAD_BUTTON_LEFT_TOP_P BINDATA "download_button_left_top_p.png" -IDR_DOWNLOAD_BUTTON_MENU_BOTTOM BINDATA "download_button_menu_bottom.png" -IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_H BINDATA "download_button_menu_bottom_h.png" -IDR_DOWNLOAD_BUTTON_MENU_BOTTOM_P BINDATA "download_button_menu_bottom_p.png" -IDR_DOWNLOAD_BUTTON_MENU_MIDDLE BINDATA "download_button_menu_middle.png" -IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_H BINDATA "download_button_menu_middle_h.png" -IDR_DOWNLOAD_BUTTON_MENU_MIDDLE_P BINDATA "download_button_menu_middle_p.png" -IDR_DOWNLOAD_BUTTON_MENU_TOP BINDATA "download_button_menu_top.png" -IDR_DOWNLOAD_BUTTON_MENU_TOP_H BINDATA "download_button_menu_top_h.png" -IDR_DOWNLOAD_BUTTON_MENU_TOP_P BINDATA "download_button_menu_top_p.png" -IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM BINDATA "download_button_right_bottom.png" -IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_H BINDATA "download_button_right_bottom_h.png" -IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_P BINDATA "download_button_right_bottom_p.png" -IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_NO_DD BINDATA "download_button_right_bottom_no_dd.png" -IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE BINDATA "download_button_right_middle.png" -IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_H BINDATA "download_button_right_middle_h.png" -IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_P BINDATA "download_button_right_middle_p.png" -IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_NO_DD BINDATA "download_button_right_middle_no_dd.png" -IDR_DOWNLOAD_BUTTON_RIGHT_TOP BINDATA "download_button_right_top.png" -IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H BINDATA "download_button_right_top_h.png" -IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P BINDATA "download_button_right_top_p.png" -IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD BINDATA "download_button_right_top_no_dd.png" -IDR_DOWNLOAD_PROGRESS_BACKGROUND_16 BINDATA "download_progress_background16.png" -IDR_DOWNLOAD_PROGRESS_FOREGROUND_16 BINDATA "download_progress_foreground16.png" -IDR_DOWNLOAD_PROGRESS_BACKGROUND_32 BINDATA "download_progress_background32.png" -IDR_DOWNLOAD_PROGRESS_FOREGROUND_32 BINDATA "download_progress_foreground32.png" -IDR_DOWNLOAD_ICON BINDATA "download_icon.png" -IDR_CONSTRAINED_BOTTOM_CENTER BINDATA "constrained_bottom_center.png" -IDR_CONSTRAINED_BOTTOM_LEFT_CORNER BINDATA "constrained_bottom_left_corner.png" -IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER BINDATA "constrained_bottom_right_corner.png" -IDR_CONSTRAINED_LEFT_SIDE BINDATA "constrained_left_side.png" -IDR_CONSTRAINED_RIGHT_SIDE BINDATA "constrained_right_side.png" -IDR_CONSTRAINED_TOP_CENTER BINDATA "constrained_top_center.png" -IDR_CONSTRAINED_TOP_LEFT_CORNER BINDATA "constrained_top_left_corner.png" -IDR_CONSTRAINED_TOP_RIGHT_CORNER BINDATA "constrained_top_right_corner.png" -IDR_FIND_BOX_BACKGROUND BINDATA "find_box_bg.png" -IDR_FIND_BOX_BACKGROUND_LEFT BINDATA "find_box_bg_left.png" -IDR_FIND_BOX_BACKGROUND_LEFT_RTL BINDATA "find_box_bg_left_rtl.png" -IDR_APP_TOP_RIGHT BINDATA "app_top_right.png" -IDR_APP_TOP_CENTER BINDATA "app_top_center.png" -IDR_APP_TOP_LEFT BINDATA "app_top_left.png" -IDR_APP_DROPARROW BINDATA "app_droparrow.png" -IDR_LOCK BINDATA "lock_small.png" -IDR_WARNING BINDATA "alert_small.png" -IDR_THROBBER_01 ICON "vista_frame_throbber_01.ico" -IDR_THROBBER_02 ICON "vista_frame_throbber_02.ico" -IDR_THROBBER_03 ICON "vista_frame_throbber_03.ico" -IDR_THROBBER_04 ICON "vista_frame_throbber_04.ico" -IDR_THROBBER_05 ICON "vista_frame_throbber_05.ico" -IDR_THROBBER_06 ICON "vista_frame_throbber_06.ico" -IDR_THROBBER_07 ICON "vista_frame_throbber_07.ico" -IDR_THROBBER_08 ICON "vista_frame_throbber_08.ico" -IDR_THROBBER_09 ICON "vista_frame_throbber_09.ico" -IDR_THROBBER_10 ICON "vista_frame_throbber_10.ico" -IDR_THROBBER_11 ICON "vista_frame_throbber_11.ico" -IDR_THROBBER_12 ICON "vista_frame_throbber_12.ico" -IDR_THROBBER_13 ICON "vista_frame_throbber_13.ico" -IDR_THROBBER_14 ICON "vista_frame_throbber_14.ico" -IDR_THROBBER_15 ICON "vista_frame_throbber_15.ico" -IDR_THROBBER_16 ICON "vista_frame_throbber_16.ico" -IDR_THROBBER_17 ICON "vista_frame_throbber_17.ico" -IDR_THROBBER_18 ICON "vista_frame_throbber_18.ico" -IDR_THROBBER_19 ICON "vista_frame_throbber_19.ico" -IDR_THROBBER_20 ICON "vista_frame_throbber_20.ico" -IDR_THROBBER_21 ICON "vista_frame_throbber_21.ico" -IDR_THROBBER_22 ICON "vista_frame_throbber_22.ico" -IDR_THROBBER_23 ICON "vista_frame_throbber_23.ico" -IDR_THROBBER_24 ICON "vista_frame_throbber_24.ico" -IDR_STOP BINDATA "stop.png" -IDR_STOP_H BINDATA "stop_h.png" -IDR_STOP_P BINDATA "stop_p.png" -IDR_FIND_DLG_LEFT_BACKGROUND BINDATA "find_dlg_left_bg.png" -IDR_FIND_DLG_RIGHT_BACKGROUND BINDATA "find_dlg_right_bg.png" -IDR_FIND_DLG_MIDDLE_BACKGROUND BINDATA "find_dlg_middle_bg.png" -IDR_PAGEINFO_GOOD BINDATA "pageinfo_good.png" -IDR_PAGEINFO_BAD BINDATA "pageinfo_bad.png" -IDR_NEWTAB_BUTTON BINDATA "newtab.png" -IDR_NEWTAB_BUTTON_H BINDATA "newtab_h.png" -IDR_NEWTAB_BUTTON_P BINDATA "newtab_p.png" -IDR_ARROW_RIGHT BINDATA "arrow_right.png" -IDR_TEXTBUTTON_TOP_LEFT_H BINDATA "textbutton_tl_h.png" -IDR_TEXTBUTTON_TOP_H BINDATA "textbutton_t_h.png" -IDR_TEXTBUTTON_TOP_RIGHT_H BINDATA "textbutton_tr_h.png" -IDR_TEXTBUTTON_LEFT_H BINDATA "textbutton_l_h.png" -IDR_TEXTBUTTON_CENTER_H BINDATA "textbutton_c_h.png" -IDR_TEXTBUTTON_RIGHT_H BINDATA "textbutton_r_h.png" -IDR_TEXTBUTTON_BOTTOM_LEFT_H BINDATA "textbutton_bl_h.png" -IDR_TEXTBUTTON_BOTTOM_H BINDATA "textbutton_b_h.png" -IDR_TEXTBUTTON_BOTTOM_RIGHT_H BINDATA "textbutton_br_h.png" -IDR_TEXTBUTTON_TOP_LEFT_P BINDATA "textbutton_tl_p.png" -IDR_TEXTBUTTON_TOP_P BINDATA "textbutton_t_p.png" -IDR_TEXTBUTTON_TOP_RIGHT_P BINDATA "textbutton_tr_p.png" -IDR_TEXTBUTTON_LEFT_P BINDATA "textbutton_l_p.png" -IDR_TEXTBUTTON_CENTER_P BINDATA "textbutton_c_p.png" -IDR_TEXTBUTTON_RIGHT_P BINDATA "textbutton_r_p.png" -IDR_TEXTBUTTON_BOTTOM_LEFT_P BINDATA "textbutton_bl_p.png" -IDR_TEXTBUTTON_BOTTOM_P BINDATA "textbutton_b_p.png" -IDR_TEXTBUTTON_BOTTOM_RIGHT_P BINDATA "textbutton_br_p.png" -IDR_SAD_TAB BINDATA "sadtab.png" -IDR_OTR_ICON BINDATA "otr_icon.png" -IDR_CONSTRAINED_BOTTOM_CENTER_V BINDATA "constrained_bottom_center_v.png" -IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V BINDATA "constrained_bottom_left_corner_v.png" -IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V BINDATA "constrained_bottom_right_corner_v.png" -IDR_CONSTRAINED_LEFT_SIDE_V BINDATA "constrained_left_side_v.png" -IDR_CONSTRAINED_RIGHT_SIDE_V BINDATA "constrained_right_side_v.png" -IDR_CONSTRAINED_TOP_CENTER_V BINDATA "constrained_top_center_v.png" -IDR_CONSTRAINED_TOP_LEFT_CORNER_V BINDATA "constrained_top_left_corner_v.png" -IDR_CONSTRAINED_TOP_RIGHT_CORNER_V BINDATA "constrained_top_right_corner_v.png" -IDR_LOCATION_BAR_KEYWORD_HINT_TAB BINDATA "keyword_hint_tab.png" -IDR_SAD_FAVICON BINDATA "sadfavicon.png" -IDR_TAB_DROP_UP BINDATA "tab_drop_up.png" -IDR_TAB_DROP_DOWN BINDATA "tab_drop_down.png" -IDR_FINDINPAGE_PREV BINDATA "find_prev.png" -IDR_FINDINPAGE_PREV_H BINDATA "find_prev_h.png" -IDR_FINDINPAGE_PREV_P BINDATA "find_prev_d.png" -IDR_FINDINPAGE_NEXT BINDATA "find_next.png" -IDR_FINDINPAGE_NEXT_H BINDATA "find_next_h.png" -IDR_FINDINPAGE_NEXT_P BINDATA "find_next_d.png" -IDR_COOKIE_ICON BINDATA "cookie.png" -IDR_INFOBAR_RESTORE_SESSION BINDATA "infobar_restore.png" -IDR_INFOBAR_SAVE_PASSWORD BINDATA "infobar_savepassword.png" -IDR_INFOBAR_SSL_WARNING BINDATA "infobar_insecure.png" -IDR_INFOBAR_ALT_NAV_URL BINDATA "infobar_didyoumean.png" -IDR_INFOBAR_PLUGIN_INSTALL BINDATA "infobar_plugin.png" -IDR_INFO_BUBBLE_CORNER_TOP_LEFT BINDATA "bubble_corner_tl.png" -IDR_INFO_BUBBLE_CORNER_TOP_RIGHT BINDATA "bubble_corner_tr.png" -IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT BINDATA "bubble_corner_bl.png" -IDR_INFO_BUBBLE_CORNER_BOTTOM_RIGHT BINDATA "bubble_corner_br.png" -IDR_MENU_MARKER BINDATA "menu_marker.png" -IDR_FROZEN_TAB_ICON BINDATA "frozen_tab.png" -IDR_UPDATE_AVAILABLE BINDATA "update_available.png" -IDR_MENU_PAGE BINDATA "menu_page.png" -IDR_MENU_CHROME BINDATA "menu_chrome.png" -IDR_LOCATIONBG_POPUPMODE_LEFT BINDATA "locationbg_readonly_left.png" -IDR_LOCATIONBG_POPUPMODE_CENTER BINDATA "locationbg_readonly_center.png" -IDR_LOCATIONBG_POPUPMODE_RIGHT BINDATA "locationbg_readonly_right.png" -IDR_CLOSE_SA BINDATA "close_sa.png" -IDR_CLOSE_SA_H BINDATA "close_sa_h.png" -IDR_CLOSE_SA_P BINDATA "close_sa_p.png" -IDR_HISTORY_SECTION BINDATA "history_section.png" -IDR_DOWNLOADS_SECTION BINDATA "downloads_section.png" -IDR_DEFAULT_THUMBNAIL BINDATA "default_thumbnail.png" -IDR_THROBBER_WAITING BINDATA "throbber_waiting.png" -IDR_INFOBAR_PLUGIN_CRASHED BINDATA "infobar_plugin_crashed.png" -IDR_UPDATE_UPTODATE BINDATA "update_uptodate.png" -IDR_UPDATE_FAIL BINDATA "update_fail.png" -IDR_CLOSE_BAR BINDATA "close_bar.png" -IDR_CLOSE_BAR_H BINDATA "close_bar_h.png" -IDR_CLOSE_BAR_P BINDATA "close_bar_p.png" -IDR_HOME BINDATA "home.png" -IDR_HOME_H BINDATA "home_h.png" -IDR_HOME_P BINDATA "home_p.png" -IDR_INPUT_GOOD BINDATA "input_good.png" -IDR_INPUT_ALERT BINDATA "input_alert.png" -IDR_HISTORY_FAVICON BINDATA "history_favicon.png" -IDR_DOWNLOADS_FAVICON BINDATA "downloads_favicon.png" -IDR_MENU_PAGE_RTL BINDATA "menu_page_rtl.png" -IDR_MENU_CHROME_RTL BINDATA "menu_chrome_rtl.png" -IDR_DOWNLOAD_ANIMATION_BEGIN BINDATA "download_animation_begin.png" -IDR_TAB_HOVER_LEFT BINDATA "tab_hover_left.png" -IDR_TAB_HOVER_CENTER BINDATA "tab_hover_center.png" -IDR_TAB_HOVER_RIGHT BINDATA "tab_hover_right.png" -IDR_FOLDER_CLOSED_RTL BINDATA "folder_closed_rtl.png" -IDR_FOLDER_OPEN_RTL BINDATA "folder_open_rtl.png" -IDR_BOOKMARK_BAR_FOLDER BINDATA "bookmark_bar_folder.png" -IDR_FIND_DLG_LEFT_BB_BACKGROUND BINDATA "find_dlg_left_bb_bg.png" -IDR_FIND_DLG_RIGHT_BB_BACKGROUND BINDATA "find_dlg_right_bb_bg.png" -IDR_FIND_DLG_MIDDLE_BB_BACKGROUND BINDATA "find_dlg_middle_bb_bg.png" -IDR_THROBBER_LIGHT BINDATA "throbber_light.png" -IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png" -IDR_BOOKMARK_MANAGER_RECENT_ICON BINDATA "bookmark_manager_recent.png" -IDR_BOOKMARK_MANAGER_SEARCH_ICON BINDATA "bookmark_manager_search.png" -IDR_MENU_DROPARROW BINDATA "menu_droparrow.png" diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index cb177e3..5308c41 100755 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -1,12 +1,12 @@ include_rules = [ "+chrome/app", - "+chrome/app/theme", # For resource identifiers "+chrome/app/locales", "+chrome/installer", "+chrome/personalization", "+chrome/tools", "+chrome/tools/profiles", # For history unit tests. "+chrome/views", + "+grit", # For generated headers "+sandbox/src", "+skia/include", "+skia/ext", diff --git a/chrome/browser/autocomplete/autocomplete_popup.cc b/chrome/browser/autocomplete/autocomplete_popup.cc index 773f7f0..dd1935d 100644 --- a/chrome/browser/autocomplete/autocomplete_popup.cc +++ b/chrome/browser/autocomplete/autocomplete_popup.cc @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/dns_global.h" diff --git a/chrome/browser/base_history_model.cc b/chrome/browser/base_history_model.cc index f1aa980..b22aa26 100644 --- a/chrome/browser/base_history_model.cc +++ b/chrome/browser/base_history_model.cc @@ -6,7 +6,7 @@ #include "base/gfx/jpeg_codec.h" #include "base/gfx/png_decoder.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/common/resource_bundle.h" #include "SkBitmap.h" diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc index d5d8038..7473d62 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc @@ -4,7 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index c175217..2129012 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/time_format.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/common/resource_bundle.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 74c65d6..413432e 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -35,7 +35,7 @@ #include "base/win_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/net/url_fixer_upper.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 09ae4c0..103b93b 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -13,7 +13,7 @@ #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_manager.h" #include "chrome/common/clipboard_service.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index cb7570e..040b0cd 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -12,7 +12,7 @@ #include "base/gfx/gdi_util.h" #include "base/gfx/point.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" diff --git a/chrome/browser/history_tab_ui.cc b/chrome/browser/history_tab_ui.cc index 7f5f89d..0f59535 100644 --- a/chrome/browser/history_tab_ui.cc +++ b/chrome/browser/history_tab_ui.cc @@ -5,7 +5,7 @@ #include "chrome/browser/history_tab_ui.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/history_model.h" #include "chrome/browser/history_view.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 87ed5f2..28b83db 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -5,7 +5,7 @@ #include "chrome/browser/password_manager/password_manager.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index 7d06128..9e8c3b1 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -5,7 +5,7 @@ #include "chrome/browser/plugin_installer.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index de46783..1a81fd4 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/load_from_memory_cache_details.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h index 8c2c89c..fc8f487 100644 --- a/chrome/browser/tab_contents/navigation_entry.h +++ b/chrome/browser/tab_contents/navigation_entry.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/security_style.h" #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/tab_contents/tab_contents_type.h" diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index a64352c..da79e48 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -8,7 +8,7 @@ #include "base/stats_table.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/renderer_host/render_process_host.h" diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index aa23d6e..f5983ca 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -9,7 +9,7 @@ #include "base/process_util.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/plugin_process_host.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 033e136..2241641 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -11,7 +11,7 @@ #include "base/win_util.h" #include "base/word_iterator.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index e961a8c..bde9f3a 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,7 +12,7 @@ #include <math.h> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index f1f8d3e..7deb438 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/base_drag_source.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index ac8d572..cd6b9c9 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 7d5faa1..3c1d78f 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -6,7 +6,7 @@ #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 6579e55..9788278 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index d4e02ed..7eec963 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index 3d91712..2ea0cdd 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/download_started_animation.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc index 3b35e6e..a033cd1 100644 --- a/chrome/browser/views/download_tab_view.cc +++ b/chrome/browser/views/download_tab_view.cc @@ -14,7 +14,7 @@ #include "base/task.h" #include "base/time_format.h" #include "base/timer.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 1c3c95f..7b66208 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/edit_keyword_controller.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index a8fcf1e..5aa6088 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index b023095..2e50325 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/first_run_customize_view.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index cfafb6b..810a31c 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/first_run_view.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 1a108c7..57fdf0a 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/ref_counted.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run.h" diff --git a/chrome/browser/views/frame/aero_glass_frame.cc b/chrome/browser/views/frame/aero_glass_frame.cc index 876ef4e..78cda9f 100644 --- a/chrome/browser/views/frame/aero_glass_frame.cc +++ b/chrome/browser/views/frame/aero_glass_frame.cc @@ -6,7 +6,7 @@ #include <dwmapi.h> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/aero_glass_non_client_view.h" diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc index 82bccfc..077fb31 100644 --- a/chrome/browser/views/frame/aero_glass_non_client_view.cc +++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/frame/aero_glass_non_client_view.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 8ccb3e5..5111358 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -9,7 +9,7 @@ #include "base/file_version_info.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc index 0066806..e007a83 100644 --- a/chrome/browser/views/frame/opaque_non_client_view.cc +++ b/chrome/browser/views/frame/opaque_non_client_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/frame/opaque_non_client_view.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/gfx/chrome_font.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 7e0b3df..fa72cc9 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/hung_renderer_view.h" #include "chrome/app/result_codes.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index ebee987..e41f45c 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/info_bubble.h" #include "base/win_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index bee39af..f8dea76 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/infobars/infobars.h" #include "base/message_loop.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 986ce09..aa30c89 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -9,7 +9,7 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index ad6b15a..f5abaa0 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/alternate_nav_url_fetcher.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 579158e8..5ca51cb 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f1af2d8..f33f104 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/color_utils.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index d73191b..3f41bbd 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index e8f19f5..ae81849 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 62bcf81..0252d7d 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/spellchecker.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index e919851..77f4847 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 7ec0ec1..0eb5104 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/sad_tab_view.h" #include "base/gfx/size.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 215e73b..a0544eb 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -7,7 +7,7 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index 2a16a20..6e16653 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/star_toggle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index a811892..31ae020 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 8f624ac..61723fac 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index e008d0d..84a68ad 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,7 +6,7 @@ #include "chrome/browser/views/tabs/tab_renderer.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 243bfa9..693ba35 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "base/gfx/size.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc index 7e43b2e..e4a017f 100644 --- a/chrome/browser/views/toolbar_star_toggle.cc +++ b/chrome/browser/views/toolbar_star_toggle.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/toolbar_star_toggle.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/views/bookmark_bubble_view.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 36cd68d..03725e0 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 16776a7..173a45f 100755 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -114,6 +114,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj Release.AspNetCompiler.Debug = "False" EndProjectSection ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -143,6 +144,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automati Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}" ProjectSection(WebsiteProperties) = preProject @@ -710,7 +714,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325 app\locales\locale_settings.h = app\locales\locale_settings.h EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_resources", "browser\resources\browser_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_resources", "app\chrome_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" @@ -727,6 +731,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theme_dll", "app\theme\them Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "security_tests", "test\security_tests\security_tests.vcproj", "{E750512D-FC7C-4C98-BF04-0A0DAF882055}" ProjectSection(WebsiteProperties) = preProject @@ -1797,6 +1804,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} {4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -3345,7 +3353,7 @@ Global {B802A2FE-E4E2-4F5A-905A-D5128875C954} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B} {B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7} - {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B6867423-23BD-4588-9321-2D500F128A3D} {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} diff --git a/chrome/chrome.xcodeproj/generate_headers.sh b/chrome/chrome.xcodeproj/generate_headers.sh index 2e54526..2f137e4 100755 --- a/chrome/chrome.xcodeproj/generate_headers.sh +++ b/chrome/chrome.xcodeproj/generate_headers.sh @@ -38,3 +38,13 @@ then -i "${PROJECT_DIR}/browser/browser_resources.grd" build \ -o "${GRIT_DIR}" fi + +# compare theme_resources.grd to theme_resources.h. If the .h is +# older or doesn't exist, rebuild it +if [ "${GRIT_DIR}/grit/theme_resources.h" -ot \ + "${PROJECT_DIR}/app/theme/theme_resources.grd" ] +then + python "${PROJECT_DIR}/../tools/grit/grit.py" \ + -i "${PROJECT_DIR}/app/theme/theme_resources.grd" build \ + -o "${GRIT_DIR}" +fi diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index 416fce2..fa10d56 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -6449,6 +6449,7 @@ HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", ../testing/gtest/include, + "$(CONFIGURATION_TEMP_DIR)/generated/grit", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -6469,6 +6470,7 @@ HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", ../testing/gtest/include, + "$(CONFIGURATION_TEMP_DIR)/generated/grit", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln index 40365ed..80021f0 100644 --- a/chrome/chrome_kjs.sln +++ b/chrome/chrome_kjs.sln @@ -114,6 +114,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj Release.AspNetCompiler.Debug = "False" EndProjectSection ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -143,6 +144,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automati Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}" ProjectSection(WebsiteProperties) = preProject @@ -712,7 +716,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325 app\locales\locale_settings.h = app\locales\locale_settings.h EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_resources", "browser\resources\browser_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_resources", "app\chrome_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" @@ -729,6 +733,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theme_dll", "app\theme\them Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "security_tests", "test\security_tests\security_tests.vcproj", "{E750512D-FC7C-4C98-BF04-0A0DAF882055}" ProjectSection(WebsiteProperties) = preProject @@ -1650,6 +1657,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} {4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -3187,7 +3195,7 @@ Global {B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {873D095E-150E-4262-8C41-2D8ED02F0F57} {B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7} - {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B6867423-23BD-4588-9321-2D500F128A3D} {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} diff --git a/chrome/test/automation/automation.vsprops b/chrome/test/automation/automation.vsprops index 632c700..e509860 100644 --- a/chrome/test/automation/automation.vsprops +++ b/chrome/test/automation/automation.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="automation" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops" > <Tool Name="VCCLCompilerTool" diff --git a/chrome/views/DEPS b/chrome/views/DEPS index 7256113..e0edd3e 100644 --- a/chrome/views/DEPS +++ b/chrome/views/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+chrome/app/theme",
"+chrome/browser",
"+chrome/browser/views",
+ "+grit", # For generated headers "+skia/ext",
"+skia/include",
"+webkit/glue",
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc index 9dc3de7..e46f624 100644 --- a/chrome/views/custom_frame_window.cc +++ b/chrome/views/custom_frame_window.cc @@ -7,7 +7,7 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/win_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc index 011a8b3..0b696ff 100644 --- a/chrome/views/menu_button.cc +++ b/chrome/views/menu_button.cc @@ -7,7 +7,7 @@ #include "chrome/views/menu_button.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/views/painter.cc b/chrome/views/painter.cc index e20820c..c79a53c 100644 --- a/chrome/views/painter.cc +++ b/chrome/views/painter.cc @@ -5,7 +5,6 @@ #include "chrome/views/painter.h" #include "base/logging.h" -#include "chrome/app/theme/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/scroll_view.cc b/chrome/views/scroll_view.cc index a440dd1..cb40f74 100644 --- a/chrome/views/scroll_view.cc +++ b/chrome/views/scroll_view.cc @@ -5,7 +5,7 @@ #include "chrome/views/scroll_view.h" #include "base/logging.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/native_scroll_bar.h" #include "chrome/views/root_view.h" diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc index 30019c4..1e98f7a 100644 --- a/chrome/views/text_button.cc +++ b/chrome/views/text_button.cc @@ -4,7 +4,7 @@ #include "chrome/views/text_button.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/throb_animation.h" diff --git a/chrome/views/throbber.cc b/chrome/views/throbber.cc index 2b6b215..4b01198 100644 --- a/chrome/views/throbber.cc +++ b/chrome/views/throbber.cc @@ -5,7 +5,7 @@ #include "chrome/views/throbber.h" #include "base/time.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc index 7d37d42e..dbd0c75 100644 --- a/chrome/views/tree_view.cc +++ b/chrome/views/tree_view.cc @@ -7,7 +7,7 @@ #include <shellapi.h> #include "base/win_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/l10n_util.h" |