chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm - Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h.

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/cocoa/infobars/infobar_container_controller.mm

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/cocoa/hung_renderer_controller.mm ('k') | chrome/browser/ui/cocoa/infobars/infobar_controller.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"	5 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"

6	6

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

8 #include "base/mac/mac_util.h"

9 #include "chrome/browser/infobars/infobar_service.h"	8 #include "chrome/browser/infobars/infobar_service.h"

10 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	9 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

11 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"	10 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"

12 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"	11 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"

13 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"	12 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"

14 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"	13 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

15 #import "chrome/browser/ui/cocoa/view_id_util.h"	14 #import "chrome/browser/ui/cocoa/view_id_util.h"

16 #include "components/infobars/core/confirm_infobar_delegate.h"	15 #include "components/infobars/core/confirm_infobar_delegate.h"

17 #include "components/infobars/core/infobar.h"	16 #include "components/infobars/core/infobar.h"

18 #include "components/infobars/core/infobar_container.h"	17 #include "components/infobars/core/infobar_container.h"

(...skipping 141 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 - (CGFloat)heightOfInfoBars {	159 - (CGFloat)heightOfInfoBars {

161 CGFloat totalHeight = 0;	160 CGFloat totalHeight = 0;

162 for (InfoBarController* controller in infobarControllers_.get()) {	161 for (InfoBarController* controller in infobarControllers_.get()) {

163 totalHeight += [controller infobar]->total_height() -	162 totalHeight += [controller infobar]->total_height() -

164 [controller infobar]->arrow_height();	163 [controller infobar]->arrow_height();

165 }	164 }

166 return totalHeight;	165 return totalHeight;

167 }	166 }

168	167

169 @end	168 @end

OLD	NEW