chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc - Issue 1545153002: Switch to standard integer types in chrome/browser/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: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/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

« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"	5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"

6	6

7 #include "base/basictypes.h"

8 #include "base/command_line.h"	7 #include "base/command_line.h"

	8 #include "base/macros.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"	10 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"

11 #include "chrome/browser/ui/views/tab_icon_view.h"	11 #include "chrome/browser/ui/views/tab_icon_view.h"

12 #include "chrome/browser/ui/views/tabs/tab.h"	12 #include "chrome/browser/ui/views/tabs/tab.h"

13 #include "chrome/common/chrome_switches.h"	13 #include "chrome/common/chrome_switches.h"

14 #include "components/signin/core/common/profile_management_switches.h"	14 #include "components/signin/core/common/profile_management_switches.h"

15 #include "ui/gfx/image/image_skia.h"	15 #include "ui/gfx/image/image_skia.h"

16 #include "ui/gfx/image/image_skia_rep.h"	16 #include "ui/gfx/image/image_skia_rep.h"

17 #include "ui/gfx/text_constants.h"	17 #include "ui/gfx/text_constants.h"

18 #include "ui/views/controls/button/image_button.h"	18 #include "ui/views/controls/button/image_button.h"

(...skipping 376 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
395	395

396 // Check the location of the avatar button.	396 // Check the location of the avatar button.

397 EXPECT_EQ("385,1 12x18", new_avatar_button_->bounds().ToString());	397 EXPECT_EQ("385,1 12x18", new_avatar_button_->bounds().ToString());

398 // The new tab button is 39px wide and slides completely under the new	398 // The new tab button is 39px wide and slides completely under the new

399 // avatar button, thus increasing the tabstrip by that amount.	399 // avatar button, thus increasing the tabstrip by that amount.

400 EXPECT_EQ("-1,13 420x29",	400 EXPECT_EQ("-1,13 420x29",

401 layout_manager_->GetBoundsForTabStrip(	401 layout_manager_->GetBoundsForTabStrip(

402 delegate_->GetTabstripPreferredSize(), kWidth).ToString());	402 delegate_->GetTabstripPreferredSize(), kWidth).ToString());

403 EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());	403 EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());

404 }	404 }

OLD	NEW