diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.scons | 1 | ||||
| -rw-r--r-- | chrome/browser/browser.vcproj | 4 | ||||
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 3 | ||||
| -rwxr-xr-x | chrome/browser/browser_resources.grd | 27 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.h | 16 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.rc | 33 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/browser_resources.vcproj | 214 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/interstitial_page.cc | 4 |
13 files changed, 132 insertions, 186 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 8584b73..af9df76 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -77,7 +77,6 @@ input_files = ChromeFileList([ 'browser_process.h', 'browser_process_impl.cc', 'browser_process_impl.h', - 'browser_resources.h', 'browser_shutdown.cc', 'browser_shutdown.h', 'browser_url_handler.cc', diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index e99c131..91c6b41 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -266,10 +266,6 @@ > </File> <File - RelativePath=".\browser_resources.h" - > - </File> - <File RelativePath=".\browser_shutdown.cc" > </File> diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 0ca3435..d8ff07f 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -17,7 +17,6 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/memory_details.h" #include "chrome/browser/net/dns_global.h" @@ -42,6 +41,8 @@ #include "chrome/browser/views/about_network_dialog.h" #endif +// Generated by GRIT +#include "browser_resources.h" #include "chromium_strings.h" #include "generated_resources.h" diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd new file mode 100755 index 0000000..9fd2215 --- /dev/null +++ b/chrome/browser/browser_resources.grd @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+ <outputs>
+ <output filename="browser_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="browser_resources.rc" type="rc_all" /> + <output filename="browser_resources.pak" type="data_package" /> + </outputs>
+ <release seq="1">
+ <includes>
+ <include name="IDR_ABOUT_PLUGINS_HTML" file="resources\about_plugins.html" type="BINDATA" />
+ <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" type="BINDATA" />
+ <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_browsing_malware_block.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" type="BINDATA" />
+ </includes>
+ </release>
+</grit>
diff --git a/chrome/browser/browser_resources.h b/chrome/browser/browser_resources.h deleted file mode 100644 index e856337..0000000 --- a/chrome/browser/browser_resources.h +++ /dev/null @@ -1,16 +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. -#define IDR_ABOUT_PLUGINS_HTML 201 -#define IDR_ABOUT_VERSION_HTML 202 -#define IDR_ABOUT_MEMORY_HTML 204 -#define IDR_ABOUT_STATS_HTML 205 -#define IDR_SSL_ROAD_BLOCK_HTML 206 -#define IDR_SSL_ERROR_HTML 207 -#define IDR_NEW_TAB_HTML 208 -#define IDR_SAFE_BROWSING_MALWARE_BLOCK 209 -#define IDR_SAFE_BROWSING_PHISHING_BLOCK 210 -#define IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK 211 -#define IDR_INCOGNITO_TAB_HTML 212 -#define IDR_CREDITS_HTML 213 -#define IDR_HISTORY_HTML 214 - diff --git a/chrome/browser/browser_resources.rc b/chrome/browser/browser_resources.rc deleted file mode 100644 index b061e4e..0000000 --- a/chrome/browser/browser_resources.rc +++ /dev/null @@ -1,33 +0,0 @@ -// Resources used by browser/*. -// -// Paths in this file are relative to SolutionDir. - -#ifdef APSTUDIO_INVOKED - #error // Don't open in the Visual Studio resource editor! -#endif //APSTUDIO_INVOKED - -#include "browser\\browser_resources.h" - -#ifdef CHROME_PERSONALIZATION -#include "chrome\\personalization\\personalization_resources.rc" -#endif - - -///////////////////////////////////////////////////////////////////////////// -// -// data resources -// - -IDR_ABOUT_PLUGINS_HTML BINDATA "browser\\resources\\about_plugins.html" -IDR_ABOUT_VERSION_HTML BINDATA "browser_resources\\about_version_flat.html" -IDR_ABOUT_MEMORY_HTML BINDATA "browser_resources\\about_memory_flat.html" -IDR_ABOUT_STATS_HTML BINDATA "browser\\resources\\about_stats.html" -IDR_SSL_ROAD_BLOCK_HTML BINDATA "browser_resources\\ssl_roadblock_flat.html" -IDR_SSL_ERROR_HTML BINDATA "browser_resources\\ssl_error_flat.html" -IDR_NEW_TAB_HTML BINDATA "browser_resources\\new_tab_flat.html" -IDR_SAFE_BROWSING_MALWARE_BLOCK BINDATA "browser_resources\\safe_browsing_malware_block_flat.html" -IDR_SAFE_BROWSING_PHISHING_BLOCK BINDATA "browser_resources\\safe_browsing_phishing_block_flat.html" -IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK BINDATA "browser_resources\\safe_browsing_multiple_threat_block_flat.html" -IDR_INCOGNITO_TAB_HTML BINDATA "browser_resources\\incognito_tab_flat.html" -IDR_CREDITS_HTML BINDATA "browser_resources\\about_credits_flat.html" -IDR_HISTORY_HTML BINDATA "browser_resources\\history_flat.html"
\ No newline at end of file diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index bab1852..ed6f3b2 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -10,7 +10,6 @@ #include "base/time.h" #include "base/time_format.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profile.h" @@ -20,6 +19,8 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/time_format.h" +// Generated by GRIT +#include "browser_resources.h" #include "chromium_strings.h" #include "generated_resources.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index e8191a5..c817905 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -10,7 +10,6 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/dom_ui/dom_ui_contents.h" #include "chrome/browser/history_tab_ui.h" #include "chrome/browser/history/page_usage_data.h" @@ -32,6 +31,8 @@ #include "chrome/personalization/personalization.h" #endif +// Generated by GRIT +#include "browser_resources.h" #include "chromium_strings.h" #include "generated_resources.h" diff --git a/chrome/browser/resources/browser_resources.vcproj b/chrome/browser/resources/browser_resources.vcproj index 0a51fd9..67bb42f 100644 --- a/chrome/browser/resources/browser_resources.vcproj +++ b/chrome/browser/resources/browser_resources.vcproj @@ -1,125 +1,89 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="browser_resources" - ProjectGUID="{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" - RootNamespace="browser_resources" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - <ToolFile - RelativePath="..\..\tools\build\win\flattened_html_file.rules" - /> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="Flattened HTML Resource" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="Flattened HTML Resource" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\about_credits.html" - > - </File> - <File - RelativePath=".\about_memory.html" - > - </File> - <File - RelativePath=".\about_stats.html" - > - </File> - <File - RelativePath=".\about_version.html" - > - </File> - <File - RelativePath=".\history.html" - > - </File> - <File - RelativePath=".\incognito_tab.html" - > - </File> - <File - RelativePath=".\new_tab.html" - > - </File> - <File - RelativePath=".\safe_browsing_malware_block.html" - > - </File> - <File - RelativePath=".\safe_browsing_multiple_threat_block.html" - > - </File> - <File - RelativePath=".\safe_browsing_phishing_block.html" - > - </File> - <File - RelativePath="..\security\resources\ssl_error.html" - > - </File> - <File - RelativePath="..\security\resources\ssl_roadblock.html" - > - </File> - <File - RelativePath="..\security\resources\ssl_roadblock_background.png" - > - </File> - <File - RelativePath="..\security\resources\ssl_roadblock_icon.png" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="browser_resources"
+ ProjectGUID="{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}"
+ RootNamespace="browser_resources"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ <ToolFile
+ RelativePath="..\..\..\tools\grit\build\grit_resources.rules"
+ />
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="10"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="WebKitVersion"
+ />
+ <Tool
+ Name="GRIT Generated Resources"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="10"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="WebKitVersion"
+ />
+ <Tool
+ Name="GRIT Generated Resources"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Generated Files"
+ SourceControlFiles="false"
+ >
+ <File
+ RelativePath="$(OutDir)\grit_derived_sources\browser_resources.h"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath="..\browser_resources.grd"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index c6b6feb..712aeb4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -9,7 +9,6 @@ #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/google_util.h" @@ -24,6 +23,8 @@ #include "generated_resources.h" #include "net/base/escape.h" +// Generated by GRIT +#include "browser_resources.h" // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 313908e..6833e3a 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -7,7 +7,6 @@ #include "base/string_piece.h" #include "base/values.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/ssl/ssl_error_info.h" @@ -21,6 +20,8 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" +// Generated by GRIT +#include "browser_resources.h" #include "generated_resources.h" // Note that we always create a navigation entry with SSL errors. diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 1784deb..19b4575 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -7,7 +7,6 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ssl/ssl_error_info.h" @@ -28,6 +27,9 @@ #include "webkit/glue/console_message_level.h" #include "webkit/glue/resource_type.h" +// Generated by GRIT +#include "browser_resources.h" + // Wrap all these helper classes in an anonymous namespace. namespace { diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 9c4ea0e..9685a4f 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -8,7 +8,6 @@ #include "base/thread.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_resources.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/renderer_host/render_widget_host_view_win.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -20,6 +19,9 @@ #include "chrome/views/window_delegate.h" #include "net/base/escape.h" +// Generated by GRIT +#include "browser_resources.h" + namespace { class ResourceRequestTask : public Task { |