chrome/browser/cocoa/toolbar_controller.mm - Issue 1001001: [Mac] Do not take Browser Actions Container view changes into account in inco...

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

Issue 1001001: [Mac] Do not take Browser Actions Container view changes into account in inco... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/cocoa/toolbar_controller.mm

===================================================================

--- chrome/browser/cocoa/toolbar_controller.mm (revision 41595)

+++ chrome/browser/cocoa/toolbar_controller.mm (working copy)

@@ -592,7 +592,7 @@

}

- (void)createBrowserActionButtons {

- if (browserActionsController_.get() == nil) {

+ if (!browserActionsController_.get()) {

browserActionsController_.reset([[BrowserActionsController alloc]

initWithBrowser:browser_

containerView:browserActionsContainerView_]);

@@ -662,6 +662,11 @@

}

- (void)toolbarFrameChanged {

+ // Do nothing if the frame changes but no Browser Action Controller is

+ // present.

+ if (!browserActionsController_.get())

+ return;

[self maintainMinimumLocationBarWidth];

if (locationBarAtMinSize_) {

« no previous file with comments | « chrome/browser/cocoa/extensions/browser_actions_controller.mm ('k') | no next file » | no next file with comments »