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 "ui/views/test/test_views_delegate.h" | 5 #include "ui/views/test/test_views_delegate.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "content/test/web_contents_tester.h" |
8 #include "ui/base/clipboard/clipboard.h" | 9 #include "ui/base/clipboard/clipboard.h" |
9 | 10 |
10 namespace views { | 11 namespace views { |
11 | 12 |
12 TestViewsDelegate::TestViewsDelegate() | 13 TestViewsDelegate::TestViewsDelegate() |
13 : use_transparent_windows_(false) { | 14 : use_transparent_windows_(false) { |
14 DCHECK(!ViewsDelegate::views_delegate); | 15 DCHECK(!ViewsDelegate::views_delegate); |
15 ViewsDelegate::views_delegate = this; | 16 ViewsDelegate::views_delegate = this; |
16 } | 17 } |
17 | 18 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 return 0; | 58 return 0; |
58 } | 59 } |
59 | 60 |
60 #if defined(USE_AURA) | 61 #if defined(USE_AURA) |
61 views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper( | 62 views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper( |
62 views::NativeWidgetAura* native_widget) { | 63 views::NativeWidgetAura* native_widget) { |
63 return NULL; | 64 return NULL; |
64 } | 65 } |
65 #endif | 66 #endif |
66 | 67 |
| 68 content::WebContents* TestViewsDelegate::CreateWebContents( |
| 69 content::BrowserContext* browser_context, |
| 70 content::SiteInstance* site_instance) { |
| 71 return content::WebContentsTester::CreateTestWebContents(browser_context, |
| 72 site_instance); |
| 73 } |
| 74 |
67 } // namespace views | 75 } // namespace views |
OLD | NEW |