diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:23:58 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:23:58 +0000 |
| commit | 151193028c0a4e5a1dbabc6b373335c0117c5574 (patch) | |
| tree | 1cadf2f985e388a791b74b2188f7727a8289c87d /chrome/chrome_tests.gypi | |
| parent | b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1 (diff) | |
| download | chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.zip chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.tar.gz chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.tar.bz2 | |
linux_aura: Compile ash into chrome.
[This is take three. I believe that I've now fixed all the static
initializers (including both files named debug_utils.cc that were
including <iostream>), the packaging failures, and the black border
on the app list as pointed out by mgiuca@.]
Running chrome with the "--open-ash" parameter will create an ash
desktop window. Ash on Linux has some problems, but at least we're now
compiling the code into the binary.
TODO: The applist isn't positioned correctly, and some details of the
system tray aren't correct.
BUG=300084, 303862
TBR=sky@chromium.org
First Review URL: https://codereview.chromium.org/25108005
Review URL: https://codereview.chromium.org/292443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 21d89ed..94ea1e0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1798,10 +1798,20 @@ ], }], ], + }, { # else: OS != "win" + 'sources!': [ + 'app/chrome_command_ids.h', + 'app/chrome_dll.rc', + 'app/chrome_dll_resource.h', + 'app/chrome_version.rc.version', + ], + }], + ['chromeos==0 and use_aura==1', { 'sources!': [ - # use_aura currently sets use_ash on Windows. So take these tests out - # for win aura builds. - # TODO: enable these for win_ash browser tests. + # On Windows and Linux, we currently don't support enough of the + # ash environment to run these unit tests. + # + # TODO: enable these on windows and linux. 'browser/chromeos/system/tray_accessibility_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', @@ -1810,13 +1820,6 @@ 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc', 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', ], - }, { # else: OS != "win" - 'sources!': [ - 'app/chrome_command_ids.h', - 'app/chrome_dll.rc', - 'app/chrome_dll_resource.h', - 'app/chrome_version.rc.version', - ], }], ['OS=="linux"', { 'dependencies': [ |