| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/widget_test.h" | 5 #include "ui/views/test/widget_test.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "ui/gfx/native_widget_types.h" | 8 #include "ui/gfx/native_widget_types.h" |
| 8 #include "ui/views/widget/root_view.h" | 9 #include "ui/views/widget/root_view.h" |
| 9 | 10 |
| 10 namespace views { | 11 namespace views { |
| 11 namespace test { | 12 namespace test { |
| 12 namespace { | 13 namespace { |
| 13 | 14 |
| 14 // Helper to encapsulate common parts of the WidgetTest::Create* methods, | 15 // Helper to encapsulate common parts of the WidgetTest::Create* methods, |
| 15 template <class NativeWidgetType> | 16 template <class NativeWidgetType> |
| 16 Widget* CreateHelper(Widget::InitParams params) { | 17 Widget* CreateHelper(Widget::InitParams params) { |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 View* TestDesktopWidgetDelegate::GetContentsView() { | 146 View* TestDesktopWidgetDelegate::GetContentsView() { |
| 146 return contents_view_ ? contents_view_ : WidgetDelegate::GetContentsView(); | 147 return contents_view_ ? contents_view_ : WidgetDelegate::GetContentsView(); |
| 147 } | 148 } |
| 148 | 149 |
| 149 bool TestDesktopWidgetDelegate::ShouldAdvanceFocusToTopLevelWidget() const { | 150 bool TestDesktopWidgetDelegate::ShouldAdvanceFocusToTopLevelWidget() const { |
| 150 return true; // Same default as DefaultWidgetDelegate in widget.cc. | 151 return true; // Same default as DefaultWidgetDelegate in widget.cc. |
| 151 } | 152 } |
| 152 | 153 |
| 153 } // namespace test | 154 } // namespace test |
| 154 } // namespace views | 155 } // namespace views |
| OLD | NEW |