chrome/browser/cocoa/tab_contents_controller.mm - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 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

« no previous file with comments | « chrome/browser/cocoa/restart_browser.mm ('k') | chrome/browser/cocoa/toolbar_controller.h » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/cocoa/tab_contents_controller.h"	5 #import "chrome/browser/cocoa/tab_contents_controller.h"

6	6

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

8 #include "base/sys_string_conversions.h"	8 #include "base/sys_string_conversions.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/bookmarks/bookmark_model.h"	10 #include "chrome/browser/bookmarks/bookmark_model.h"

11 #import "chrome/browser/cocoa/view_id_util.h"	11 #import "chrome/browser/cocoa/view_id_util.h"

12 #include "chrome/browser/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

13 #include "chrome/browser/renderer_host/render_view_host.h"	13 #include "chrome/browser/renderer_host/render_view_host.h"

14 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

15 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

16	16

17 // Default offset of the contents splitter in pixels.	17 // Default offset of the contents splitter in pixels.

18 static const int kDefaultContentsSplitOffset = 400;	18 static const int kDefaultContentsSplitOffset = 400;

19	19

20 // Never make the web part of the tab contents smaller than this (needed if the	20 // Never make the web part of the tab contents smaller than this (needed if the

21 // window is only a few pixels high).	21 // window is only a few pixels high).

22 static const int kMinWebHeight = 50;	22 static const int kMinWebHeight = 50;

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141	141

142 - (CGFloat)devToolsHeight {	142 - (CGFloat)devToolsHeight {

143 NSArray* subviews = [contentsContainer_ subviews];	143 NSArray* subviews = [contentsContainer_ subviews];

144 if ([subviews count] < 2)	144 if ([subviews count] < 2)

145 return 0;	145 return 0;

146 return NSHeight([[subviews objectAtIndex:1] frame]) +	146 return NSHeight([[subviews objectAtIndex:1] frame]) +

147 [contentsContainer_ dividerThickness];	147 [contentsContainer_ dividerThickness];

148 }	148 }

149	149

150 @end	150 @end

OLD	NEW