chrome/browser/ui/cocoa/infobars/infobar_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_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 5 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/cocoa/infobars/infobar_container_controller.mm ('k') | chrome/browser/ui/cocoa/login_prompt_cocoa.mm » ('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 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"	5 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"

6	6

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

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

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

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

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

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

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

14 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"	13 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"

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

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

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

18 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"	17 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

19 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
178 [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];	177 [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];

179 [[labelPlaceholder_ superview]	178 [[labelPlaceholder_ superview]

180 replaceSubview:labelPlaceholder_ with:newLabel];	179 replaceSubview:labelPlaceholder_ with:newLabel];

181 labelPlaceholder_ = nil; // Now released.	180 labelPlaceholder_ = nil; // Now released.

182 [newLabel setDelegate:self];	181 [newLabel setDelegate:self];

183	182

184 label_.reset(newLabel.release());	183 label_.reset(newLabel.release());

185 }	184 }

186	185

187 @end	186 @end

OLD	NEW