chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/app_panel_browser_frame_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/find_bar_view.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

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

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

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

9 #include "chrome/browser/ui/views/frame/browser_frame.h"	9 #include "chrome/browser/ui/views/frame/browser_frame.h"

10 #include "chrome/browser/ui/views/frame/browser_view.h"	10 #include "chrome/browser/ui/views/frame/browser_view.h"

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

12 #include "content/public/browser/web_contents.h"	12 #include "content/public/browser/web_contents.h"

13 #include "grit/chromium_strings.h"	13 #include "grit/chromium_strings.h"

14 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

15 #include "grit/theme_resources.h"	15 #include "grit/theme_resources.h"

16 #include "grit/ui_resources.h"	16 #include "grit/ui_resources.h"

17 #include "ui/base/hit_test.h"	17 #include "ui/base/hit_test.h"

18 #include "ui/base/l10n/l10n_util.h"	18 #include "ui/base/l10n/l10n_util.h"

(...skipping 488 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
507 }	507 }

508	508

509 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,	509 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,

510 int height) const {	510 int height) const {

511 int top_height = NonClientTopBorderHeight();	511 int top_height = NonClientTopBorderHeight();

512 int border_thickness = NonClientBorderThickness();	512 int border_thickness = NonClientBorderThickness();

513 return gfx::Rect(border_thickness, top_height,	513 return gfx::Rect(border_thickness, top_height,

514 std::max(0, width - (2 * border_thickness)),	514 std::max(0, width - (2 * border_thickness)),

515 std::max(0, height - top_height - border_thickness));	515 std::max(0, height - top_height - border_thickness));

516 }	516 }

OLD	NEW