chrome/browser/ui/cocoa/infobars/infobar_utilities.mm - Issue 793783003: Move infobar constants and the code that uses them from components/ to chrome/.

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

Unified Diff: chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

Issue 793783003: Move infobar constants and the code that uses them from components/ to chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: NULL -> nullptr 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm ('k') | chrome/browser/ui/infobar_container_delegate.h » ('j') | chrome/browser/ui/infobar_container_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_utilities.mm b/chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

index 2ff64d0cfa7de7876bc00410e41aea3ac569d8a1..29831ff69551206a5791815197e481882f3d1f79 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

@@ -7,6 +7,7 @@

#include "base/mac/scoped_nsobject.h"

#import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"

#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"

+#include "chrome/browser/ui/infobar_container_delegate.h"

#import "components/infobars/core/infobar.h"

#import "ui/base/cocoa/nsview_additions.h"

@@ -66,7 +67,7 @@ void VerticallyCenterView(NSView* toMove) {

// rather than in the total height (which includes the bulge).

CGFloat superHeight = NSHeight(superViewFrame);

if ([[toMove superview] isKindOfClass:[InfoBarGradientView class]])

- superHeight = infobars::InfoBar::kDefaultBarTargetHeight;

+ superHeight = InfoBarContainerDelegate::kDefaultBarTargetHeight;

viewFrame.origin.y =

floor((superHeight - NSHeight(viewFrame)) / 2.0);

[toMove setFrame:viewFrame];