| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ | 5 #ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ |
| 6 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ | 6 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "chrome/test/base/test_browser_window.h" | 9 #include "chrome/test/base/test_browser_window.h" |
| 9 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 10 | 11 |
| 11 // A browser window proxy with an associated Aura native window. | 12 // A browser window proxy with an associated Aura native window. |
| 12 class TestBrowserWindowAura : public TestBrowserWindow { | 13 class TestBrowserWindowAura : public TestBrowserWindow { |
| 13 public: | 14 public: |
| 14 explicit TestBrowserWindowAura(scoped_ptr<aura::Window> native_window); | 15 explicit TestBrowserWindowAura(scoped_ptr<aura::Window> native_window); |
| 15 ~TestBrowserWindowAura() override; | 16 ~TestBrowserWindowAura() override; |
| 16 | 17 |
| 17 // TestBrowserWindow overrides: | 18 // TestBrowserWindow overrides: |
| (...skipping 16 matching lines...) Expand all Loading... |
| 34 // Helper that creates a browser with a native Aura |window|. If |window| is | 35 // Helper that creates a browser with a native Aura |window|. If |window| is |
| 35 // nullptr, it will create an Aura window to associate with the browser. It also | 36 // nullptr, it will create an Aura window to associate with the browser. It also |
| 36 // handles the lifetime of TestBrowserWindowAura. | 37 // handles the lifetime of TestBrowserWindowAura. |
| 37 scoped_ptr<Browser> CreateBrowserWithAuraTestWindowForParams( | 38 scoped_ptr<Browser> CreateBrowserWithAuraTestWindowForParams( |
| 38 scoped_ptr<aura::Window> window, | 39 scoped_ptr<aura::Window> window, |
| 39 Browser::CreateParams* params); | 40 Browser::CreateParams* params); |
| 40 | 41 |
| 41 } // namespace chrome | 42 } // namespace chrome |
| 42 | 43 |
| 43 #endif // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ | 44 #endif // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_AURA_H_ |
| OLD | NEW |