diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 15:50:57 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 15:50:57 +0000 |
| commit | d0407fa2b95f9f57a4efbab392ee4de4830aadc3 (patch) | |
| tree | 0b4381b3934f4b37232ab00524db62e49f247ed1 /chrome/browser/task_manager | |
| parent | ab6105b07fbb66bc867e421dbd62847487d63d5f (diff) | |
| download | chromium_src-d0407fa2b95f9f57a4efbab392ee4de4830aadc3.zip chromium_src-d0407fa2b95f9f57a4efbab392ee4de4830aadc3.tar.gz chromium_src-d0407fa2b95f9f57a4efbab392ee4de4830aadc3.tar.bz2 | |
Remove various uses of TOUCH_UI that are no longer needed
This includes:
- Don't try to replace small resources with large ones based on a compile flag. We'll need a more dynamic mechanism.
- No need to disable the Getting Started Guide
- Anything with TOOLKIT_USES_GTK won't support touch.
- Don't need the screen locker logout hack. WebUI screen locker now works, and is also about to work on Aura builds.
- Re-enable a bunch of tests which were disabled/flaky in TOUCH_UI builds.
- No need to disable SSL Client certificate selector, we have a WebUI version now.
- TOUCH-specific max tab count is gone, remove hack from test.
- Remove exclusions from chrome_tests.gypi for touch tests that are no longer included in the build.
BUG=105046
TEST=
Review URL: http://codereview.chromium.org/8691005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index cdf5391..0271729 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -39,8 +39,6 @@ // In some environments this test fails about 1/6 http://crbug/84850 #if defined(OS_LINUX) #define MAYBE_KillExtension DISABLED_KillExtension -#elif defined(TOUCH_UI) -#define MAYBE_KillExtension FLAKY_KillExtension #else #define MAYBE_KillExtension KillExtension #endif |