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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
302 }; | 302 }; |
303 | 303 |
304 // Factory for creating a TestDesktopBrowserFrameAura. | 304 // Factory for creating a TestDesktopBrowserFrameAura. |
305 class TestNativeBrowserFrameFactory : public NativeBrowserFrameFactory { | 305 class TestNativeBrowserFrameFactory : public NativeBrowserFrameFactory { |
306 public: | 306 public: |
307 TestNativeBrowserFrameFactory() {} | 307 TestNativeBrowserFrameFactory() {} |
308 ~TestNativeBrowserFrameFactory() override {} | 308 ~TestNativeBrowserFrameFactory() override {} |
309 | 309 |
310 NativeBrowserFrame* Create(BrowserFrame* browser_frame, | 310 NativeBrowserFrame* Create(BrowserFrame* browser_frame, |
311 BrowserView* browser_view) override { | 311 BrowserView* browser_view) override { |
312 #if defined(USE_OZONE) | |
sky
2016/11/04 21:33:02
Without TestDesktopBrowserFrameAura TabDragCapture
Tom (Use chromium acct)
2016/11/04 21:54:21
That would not fix the linker error. The error is
sky
2016/11/04 23:15:39
If that's the case, don't you need an ifdef around
Tom (Use chromium acct)
2016/11/04 23:34:05
Oops, I meant there's no CreateBrowserDesktopWindo
| |
313 NOTIMPLEMENTED() | |
314 << "For Ozone builds, only --mash launch is supported for now."; | |
315 return nullptr; | |
316 #else | |
312 return new TestDesktopBrowserFrameAura(browser_frame, browser_view); | 317 return new TestDesktopBrowserFrameAura(browser_frame, browser_view); |
318 #endif | |
313 } | 319 } |
314 | 320 |
315 private: | 321 private: |
316 DISALLOW_COPY_AND_ASSIGN(TestNativeBrowserFrameFactory); | 322 DISALLOW_COPY_AND_ASSIGN(TestNativeBrowserFrameFactory); |
317 }; | 323 }; |
318 | 324 |
319 class TabDragCaptureLostTest : public TabDragControllerTest { | 325 class TabDragCaptureLostTest : public TabDragControllerTest { |
320 public: | 326 public: |
321 TabDragCaptureLostTest() { | 327 TabDragCaptureLostTest() { |
322 NativeBrowserFrameFactory::Set(new TestNativeBrowserFrameFactory); | 328 NativeBrowserFrameFactory::Set(new TestNativeBrowserFrameFactory); |
(...skipping 2176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2499 DetachToBrowserTabDragControllerTest, | 2505 DetachToBrowserTabDragControllerTest, |
2500 ::testing::Values("mouse", "touch")); | 2506 ::testing::Values("mouse", "touch")); |
2501 INSTANTIATE_TEST_CASE_P(TabDragging, | 2507 INSTANTIATE_TEST_CASE_P(TabDragging, |
2502 DetachToBrowserTabDragControllerTestTouch, | 2508 DetachToBrowserTabDragControllerTestTouch, |
2503 ::testing::Values("touch")); | 2509 ::testing::Values("touch")); |
2504 #else | 2510 #else |
2505 INSTANTIATE_TEST_CASE_P(TabDragging, | 2511 INSTANTIATE_TEST_CASE_P(TabDragging, |
2506 DetachToBrowserTabDragControllerTest, | 2512 DetachToBrowserTabDragControllerTest, |
2507 ::testing::Values("mouse")); | 2513 ::testing::Values("mouse")); |
2508 #endif | 2514 #endif |
OLD | NEW |