diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
| commit | 45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f (patch) | |
| tree | cffc5e3be784e5fcebe2d6390055d9b010df3c46 /chrome/chrome_tests.gypi | |
| parent | 93f942621d858fdae51cdecf3d2f234967b671aa (diff) | |
| download | chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.zip chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.gz chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.bz2 | |
Revert 270232 "linux_aura: Compile ash into chrome."
Reverted once again because because there are two more static initializers.
> linux_aura: Compile ash into chrome.
>
> [This is a reland now that the static initializers should be fixed.]
>
> 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/270383007
TBR=erg@chromium.org
Review URL: https://codereview.chromium.org/287783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 36a21b9..b7d430f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1798,20 +1798,10 @@ ], }], ], - }, { # 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!': [ - # 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. + # 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. 'browser/chromeos/system/tray_accessibility_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', @@ -1820,6 +1810,13 @@ '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': [ |