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

Side by Side Diff: ui/gfx/test/gfx_util.cc

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « ui/gfx/test/display_util.h ('k') | ui/message_center/views/message_popup_collection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/gfx/test/gfx_util.h" 5 #include "ui/gfx/test/gfx_util.h"
6 6
7 #include <iomanip> 7 #include <iomanip>
8 #include <sstream> 8 #include <sstream>
9 #include <string> 9 #include <string>
10 10
11 #include "ui/gfx/display.h"
12 #include "ui/gfx/geometry/box_f.h" 11 #include "ui/gfx/geometry/box_f.h"
13 #include "ui/gfx/geometry/point.h" 12 #include "ui/gfx/geometry/point.h"
14 #include "ui/gfx/geometry/point3_f.h" 13 #include "ui/gfx/geometry/point3_f.h"
15 #include "ui/gfx/geometry/point_f.h" 14 #include "ui/gfx/geometry/point_f.h"
16 #include "ui/gfx/geometry/quad_f.h" 15 #include "ui/gfx/geometry/quad_f.h"
17 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
18 #include "ui/gfx/geometry/rect_f.h" 17 #include "ui/gfx/geometry/rect_f.h"
19 #include "ui/gfx/geometry/scroll_offset.h" 18 #include "ui/gfx/geometry/scroll_offset.h"
20 #include "ui/gfx/geometry/size.h" 19 #include "ui/gfx/geometry/size.h"
21 #include "ui/gfx/geometry/size_f.h" 20 #include "ui/gfx/geometry/size_f.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return ::testing::AssertionFailure() << "Value of: " << rhs_expr 88 return ::testing::AssertionFailure() << "Value of: " << rhs_expr
90 << "\n Actual: " << ColorAsString(rhs) 89 << "\n Actual: " << ColorAsString(rhs)
91 << "\nExpected: " << lhs_expr 90 << "\nExpected: " << lhs_expr
92 << "\nWhich is: " << ColorAsString(lhs); 91 << "\nWhich is: " << ColorAsString(lhs);
93 } 92 }
94 93
95 void PrintTo(const BoxF& box, ::std::ostream* os) { 94 void PrintTo(const BoxF& box, ::std::ostream* os) {
96 *os << box.ToString(); 95 *os << box.ToString();
97 } 96 }
98 97
99 void PrintTo(const Display& display, ::std::ostream* os) {
100 *os << display.ToString();
101 }
102
103 void PrintTo(const Point& point, ::std::ostream* os) { 98 void PrintTo(const Point& point, ::std::ostream* os) {
104 *os << point.ToString(); 99 *os << point.ToString();
105 } 100 }
106 101
107 void PrintTo(const Point3F& point, ::std::ostream* os) { 102 void PrintTo(const Point3F& point, ::std::ostream* os) {
108 *os << point.ToString(); 103 *os << point.ToString();
109 } 104 }
110 105
111 void PrintTo(const PointF& point, ::std::ostream* os) { 106 void PrintTo(const PointF& point, ::std::ostream* os) {
112 *os << point.ToString(); 107 *os << point.ToString();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 141
147 void PrintTo(const Vector2dF& vector, ::std::ostream* os) { 142 void PrintTo(const Vector2dF& vector, ::std::ostream* os) {
148 *os << vector.ToString(); 143 *os << vector.ToString();
149 } 144 }
150 145
151 void PrintTo(const Vector3dF& vector, ::std::ostream* os) { 146 void PrintTo(const Vector3dF& vector, ::std::ostream* os) {
152 *os << vector.ToString(); 147 *os << vector.ToString();
153 } 148 }
154 149
155 } // namespace gfx 150 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/test/display_util.h ('k') | ui/message_center/views/message_popup_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698