diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-24 18:32:49 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-24 18:32:49 +0000 |
| commit | 25bc66a244dd0f00d1474adb01f20e02137a1b43 (patch) | |
| tree | 9f275f23ea3a13c41c954f23962687a36b4e7ed9 /build | |
| parent | 3f60a5092273299f074e581cff28fee7fe848a06 (diff) | |
| download | chromium_src-25bc66a244dd0f00d1474adb01f20e02137a1b43.zip chromium_src-25bc66a244dd0f00d1474adb01f20e02137a1b43.tar.gz chromium_src-25bc66a244dd0f00d1474adb01f20e02137a1b43.tar.bz2 | |
+ renamed window_snapshot_x.cc => window_snapshot_gtk.cc
+ added window_snapshot_aura.cc
+ added missing members to icon_loader_aura.cc
+ fixed a couple of minor issues with #includes
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8028012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2d0beb7..80692ab 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -246,8 +246,8 @@ # A flag to enable or disable our compile-time dependency # on gnome-keyring. If that dependency is disabled, no gnome-keyring # support will be available. This option is useful - # for Linux distributions. - ['chromeos==1', { + # for Linux distributions and for Aura. + ['chromeos==1 or use_aura==1', { 'use_gnome_keyring%': 0, }, { 'use_gnome_keyring%': 1, |