diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:04:02 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:04:02 +0000 |
| commit | f46251eeb2b498c749a8ec776f2a8e39409a321e (patch) | |
| tree | d3203d530800ac6db6acaac22438ac35fc8d44df /views | |
| parent | 44ac8912f993424d041460d526ff131286e8c5ca (diff) | |
| download | chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.zip chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.tar.gz chromium_src-f46251eeb2b498c749a8ec776f2a8e39409a321e.tar.bz2 | |
Remove themes/default.dll and merge the resources into chrome.dll.
This gives us one less file to load on startup. This does mean
that some tests need to explicitly include theme_resources.rc.
BUG=24035
Review URL: http://codereview.chromium.org/348033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/examples/examples_main.cc | 1 | ||||
| -rw-r--r-- | views/views.gyp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index 2dc6c96..d061871 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -45,7 +45,6 @@ void ExamplesMain::Run() { // This requires chrome to be built first right now. // TODO(oshima): fix build to include resource file. ResourceBundle::InitSharedInstance(L"en-US"); - ResourceBundle::GetSharedInstance().LoadThemeResources(); MessageLoop main_message_loop(MessageLoop::TYPE_UI); diff --git a/views/views.gyp b/views/views.gyp index 7074cf9..4e86d4d 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -361,6 +361,8 @@ 'examples/scroll_view_example.h', 'examples/tabbed_pane_example.h', 'examples/textfield_example.h', + + '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc', ], 'conditions': [ ['OS=="linux"', { |