ui/views/controls/button/label_button_unittest.cc - Issue 1543173002: Switch to standard integer types in ui/views/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/controls/button/label_button_unittest.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

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/controls/button/label_button.h"	5 #include "ui/views/controls/button/label_button.h"

6	6

	7 #include "base/macros.h"

7 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

8 #include "third_party/skia/include/core/SkBitmap.h"	9 #include "third_party/skia/include/core/SkBitmap.h"

9 #include "ui/accessibility/ax_view_state.h"	10 #include "ui/accessibility/ax_view_state.h"

10 #include "ui/gfx/canvas.h"	11 #include "ui/gfx/canvas.h"

11 #include "ui/gfx/font_list.h"	12 #include "ui/gfx/font_list.h"

12 #include "ui/gfx/geometry/size.h"	13 #include "ui/gfx/geometry/size.h"

13 #include "ui/gfx/text_utils.h"	14 #include "ui/gfx/text_utils.h"

14 #include "ui/views/test/widget_test.h"	15 #include "ui/views/test/widget_test.h"

15	16

16 using base::ASCIIToUTF16;	17 using base::ASCIIToUTF16;

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
275 button_->SetImageLabelSpacing(2 * kOriginalSpacing);	276 button_->SetImageLabelSpacing(2 * kOriginalSpacing);

276 EXPECT_GT(button_->GetPreferredSize().width(), original_width);	277 EXPECT_GT(button_->GetPreferredSize().width(), original_width);

277	278

278 // The button shrinks if the original spacing is restored.	279 // The button shrinks if the original spacing is restored.

279 button_->SetMinSize(gfx::Size());	280 button_->SetMinSize(gfx::Size());

280 button_->SetImageLabelSpacing(kOriginalSpacing);	281 button_->SetImageLabelSpacing(kOriginalSpacing);

281 EXPECT_EQ(original_width, button_->GetPreferredSize().width());	282 EXPECT_EQ(original_width, button_->GetPreferredSize().width());

282 }	283 }

283	284

284 } // namespace views	285 } // namespace views

OLD	NEW

« no previous file with comments | « ui/views/controls/button/label_button_border.h ('k') | ui/views/controls/button/menu_button.h » ('j') | ui/views/metrics_aura.cc » ('J')