chrome/browser/ui/panels/panel_browser_window_cocoa.mm - Issue 7981037: Fix Mac build, bad merge.

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/panels/panel_browser_window_cocoa.mm

Issue 7981037: Fix Mac build, bad merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 3 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:

Index: chrome/browser/ui/panels/panel_browser_window_cocoa.mm

diff --git a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm

index 5afc84ef4f69e84453c2e1a197d733a89d22c0b0..3db15c3396df809e243a0ff97f7a4f135cdea6c8 100644

--- a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm

+++ b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm

@@ -347,5 +347,5 @@ void NativePanelTestingCocoa::SetMousePositionForMinimizeRestore(

}

int NativePanelTestingCocoa::TitleOnlyHeight() const {

- return [native_panel_window_->controller_ titlebarHeightInScreeenCoordinates];

+ return [native_panel_window_->controller_ titlebarHeightInScreenCoordinates];

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »