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

Side by Side Diff: gfx/size.cc

Issue 2895012: Disablging failing ui tests: RestoreWindow and RestoreWindowAndTab (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 years, 5 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 | « chrome/browser/tab_restore_uitest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "gfx/size.h" 5 #include "gfx/size.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #elif defined(OS_MACOSX) 9 #elif defined(OS_MACOSX)
10 #include <CoreGraphics/CGGeometry.h> 10 #include <CoreGraphics/CGGeometry.h>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 return s; 42 return s;
43 } 43 }
44 #elif defined(OS_MACOSX) 44 #elif defined(OS_MACOSX)
45 CGSize Size::ToCGSize() const { 45 CGSize Size::ToCGSize() const {
46 return CGSizeMake(width_, height_); 46 return CGSizeMake(width_, height_);
47 } 47 }
48 #endif 48 #endif
49 49
50 void Size::set_width(int width) { 50 void Size::set_width(int width) {
51 if (width < 0) { 51 if (width < 0) {
52 NOTREACHED(); 52 NOTREACHED() << "negative width:" << this;
53 width = 0; 53 width = 0;
54 } 54 }
55 width_ = width; 55 width_ = width;
56 } 56 }
57 57
58 void Size::set_height(int height) { 58 void Size::set_height(int height) {
59 if (height < 0) { 59 if (height < 0) {
60 NOTREACHED(); 60 NOTREACHED() << "negative height:" << this;
61 height = 0; 61 height = 0;
62 } 62 }
63 height_ = height; 63 height_ = height;
64 } 64 }
65 65
66 } // namespace gfx 66 } // namespace gfx
67 67
68 std::ostream& operator<<(std::ostream& out, const gfx::Size& s) { 68 std::ostream& operator<<(std::ostream& out, const gfx::Size& s) {
69 return out << s.width() << "x" << s.height(); 69 return out << s.width() << "x" << s.height();
70 } 70 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698