diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 21:58:55 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 21:58:55 +0000 |
| commit | 1bce0b66d9de24d21afc8cd672f7e1100dfe0b55 (patch) | |
| tree | 0fa9daf6423986af953f53c5fb0f226034fcc773 /chrome/browser/dom_ui | |
| parent | 4ca1372726d465d18036bf3142f45ca47006ba4e (diff) | |
| download | chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.zip chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.tar.gz chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.tar.bz2 | |
Move browser_resources.rc into a a grd file. While I'm at it,
I removed the flatten_html visual studio rule and just rolled the
functionality directly into GRIT.
The sln change is to have browser depend on browser_resources (now needed for browser_resources.h).
Review URL: http://codereview.chromium.org/21148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 3 |
2 files changed, 4 insertions, 2 deletions
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" |