| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2048 ui_controls::SendMouseEventsNotifyWhenDone( | 2048 ui_controls::SendMouseEventsNotifyWhenDone( |
| 2049 ui_controls::LEFT, ui_controls::UP, | 2049 ui_controls::LEFT, ui_controls::UP, |
| 2050 CreateEventTask(this, &BookmarkBarViewTest22::Done)); | 2050 CreateEventTask(this, &BookmarkBarViewTest22::Done)); |
| 2051 #else | 2051 #else |
| 2052 // There are no widgets to send the mouse release to. | 2052 // There are no widgets to send the mouse release to. |
| 2053 Done(); | 2053 Done(); |
| 2054 #endif | 2054 #endif |
| 2055 } | 2055 } |
| 2056 }; | 2056 }; |
| 2057 | 2057 |
| 2058 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 2058 #if defined(OS_WIN) |
| 2059 // TODO(pkotwicz): Enable on Desktop Linux once crbug.com/438365 is fixed. | |
| 2060 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag | |
| 2061 #elif defined(OS_WIN) | |
| 2062 // This test times out on Windows. TODO(pkotwicz): Find out why. | 2059 // This test times out on Windows. TODO(pkotwicz): Find out why. |
| 2063 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag | 2060 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag |
| 2064 #else | 2061 #else |
| 2065 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag | 2062 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag |
| 2066 #endif | 2063 #endif |
| 2067 | 2064 |
| 2068 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) | 2065 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag) |
| OLD | NEW |