diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-09 03:15:24 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-09 03:15:24 +0000 |
| commit | b76a0b09a2a375cecd4c0647738f9aaff21dab06 (patch) | |
| tree | b7c1636c646bc08bc93858365b7a190a1abf785f /chrome | |
| parent | dd51bd8427f7fdc7071d0c189dd96a6b392dac3f (diff) | |
| download | chromium_src-b76a0b09a2a375cecd4c0647738f9aaff21dab06.zip chromium_src-b76a0b09a2a375cecd4c0647738f9aaff21dab06.tar.gz chromium_src-b76a0b09a2a375cecd4c0647738f9aaff21dab06.tar.bz2 | |
Random cleanups and stubs to get cross platform build going.
TBR=beng
Review URL: http://codereview.chromium.org/115158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_theme_provider.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index 72d5fb1..c04c508 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -222,7 +222,7 @@ SkBitmap* BrowserThemeProvider::LoadThemeBitmap(int id) { if (images_.count(id)) { // First check to see if we have a registered theme extension and whether // it can handle this resource. -#ifdef OS_WIN +#if defined(OS_WIN) FilePath path = FilePath(UTF8ToWide(images_[id])); #else FilePath path = FilePath(images_[id]); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index edbbcab..bb275dc 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -755,6 +755,8 @@ 'browser/dom_ui/dom_ui_factory.h', 'browser/dom_ui/dom_ui_favicon_source.cc', 'browser/dom_ui/dom_ui_favicon_source.h', + 'browser/dom_ui/dom_ui_theme_source.cc', + 'browser/dom_ui/dom_ui_theme_source.h', 'browser/dom_ui/dom_ui_thumbnail_source.cc', 'browser/dom_ui/dom_ui_thumbnail_source.h', 'browser/dom_ui/downloads_ui.cc', @@ -3388,8 +3390,8 @@ '../tools/code_coverage/coverage_posix.py', '--directory', '<(PRODUCT_DIR)', - '--', - '<@(_dependencies)'], + '--', + '<@(_dependencies)'], # Use outputs of this action as inputs for the main target build. # Seems as a misnomer but makes this happy on Linux (scons). 'process_outputs_as_sources': 1, |