Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1137)

Side by Side Diff: ui/views/test/views_test_base.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Deleted LayoutDelegate and HarmonyLayoutDelegate. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/views_test_base.h" 5 #include "ui/views/test/views_test_base.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "ui/base/clipboard/clipboard.h" 11 #include "ui/base/clipboard/clipboard.h"
12 #include "ui/base/material_design/material_design_controller.h" 12 #include "ui/base/material_design/material_design_controller.h"
13 #include "ui/base/test/material_design_controller_test_api.h" 13 #include "ui/base/test/material_design_controller_test_api.h"
14 #include "ui/views/layout/views_layout_delegate.h"
Peter Kasting 2017/04/04 02:08:57 Nit: This #include doesn't seem necessary?
kylix_rd 2017/04/04 20:28:23 Done.
14 #include "ui/views/test/platform_test_helper.h" 15 #include "ui/views/test/platform_test_helper.h"
15 16
16 #if defined(USE_X11) && !defined(OS_CHROMEOS) 17 #if defined(USE_X11) && !defined(OS_CHROMEOS)
17 #include "ui/base/x/x11_util_internal.h" 18 #include "ui/base/x/x11_util_internal.h"
18 #endif 19 #endif
19 20
20 namespace views { 21 namespace views {
21 22
22 namespace { 23 namespace {
23 24
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 108
108 void ViewsTestBase::SimulateNativeDestroy(Widget* widget) { 109 void ViewsTestBase::SimulateNativeDestroy(Widget* widget) {
109 test_helper_->platform_test_helper()->SimulateNativeDestroy(widget); 110 test_helper_->platform_test_helper()->SimulateNativeDestroy(widget);
110 } 111 }
111 112
112 gfx::NativeWindow ViewsTestBase::GetContext() { 113 gfx::NativeWindow ViewsTestBase::GetContext() {
113 return test_helper_->GetContext(); 114 return test_helper_->GetContext();
114 } 115 }
115 116
116 } // namespace views 117 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698