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

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/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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | no next file » | 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 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"	5 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"

6	6

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

8 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.h"

9 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"	9 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"

10 #import "chrome/browser/ui/cocoa/browser_window_utils.h"	10 #import "chrome/browser/ui/cocoa/browser_window_utils.h"

(...skipping 329 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
340 }	340 }

341	341

342 // TODO(dimich) this method is platform-independent. Reuse it.	342 // TODO(dimich) this method is platform-independent. Reuse it.

343 void NativePanelTestingCocoa::SetMousePositionForMinimizeRestore(	343 void NativePanelTestingCocoa::SetMousePositionForMinimizeRestore(

344 const gfx::Point& hover_point) {	344 const gfx::Point& hover_point) {

345 PanelMouseWatcher::GetInstance()->HandleMouseMovement(hover_point);	345 PanelMouseWatcher::GetInstance()->HandleMouseMovement(hover_point);

346 MessageLoopForUI::current()->RunAllPending();	346 MessageLoopForUI::current()->RunAllPending();

347 }	347 }

348	348

349 int NativePanelTestingCocoa::TitleOnlyHeight() const {	349 int NativePanelTestingCocoa::TitleOnlyHeight() const {

350 return [native_panel_window_->controller_ titlebarHeightInScreeenCoordinates];	350 return [native_panel_window_->controller_ titlebarHeightInScreenCoordinates];

351 }	351 }

OLD	NEW