Unify the page and wrench menus into one wrench menu. Remove pref to hide men...

Unify the page and wrench menus into one wrench menu. Remove pref to hide menu. 
Nib updates:
Toolbar.xib: Removed page menu and moved everything over to accomodate.
Prefs.xib: Removed "show options page/wrench menu" checkbox and moved everything up to accomodate.
BUG=45756
TEST=migration from having the pref hidden. It should become visible.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=49830

[rohitrao (OOO until 6-22), 2010-06-15 19:33:19]

http://codereview.chromium.org/2828005/diff/1/7
File chrome/browser/cocoa/toolbar_controller.mm (right):

http://codereview.chromium.org/2828005/diff/1/7#newcode561
chrome/browser/cocoa/toolbar_controller.mm:561: BOOL rightBorderShown =
![wrenchButton_ isHidden];
Is this always going to be YES?  Can this logic come out too?

Maybe file a bug to remove the setRightBorderShown code from the container view.

http://codereview.chromium.org/2828005/diff/1/7#newcode597
chrome/browser/cocoa/toolbar_controller.mm:597: CGFloat edgeXPos =
[wrenchButton_ isHidden] ?
Same question here.

http://codereview.chromium.org/2828005/diff/1/8
File chrome/browser/cocoa/toolbar_controller_unittest.mm (left):

http://codereview.chromium.org/2828005/diff/1/8#oldcode216
chrome/browser/cocoa/toolbar_controller_unittest.mm:216: EXPECT_EQ([wrenchButton
isHidden], YES);
Should we still be checking that the wrench button is hidden?

[pink, 2010-06-15 20:08:21]

new version up.

http://codereview.chromium.org/2828005/diff/1/7
File chrome/browser/cocoa/toolbar_controller.mm (right):

http://codereview.chromium.org/2828005/diff/1/7#newcode561
chrome/browser/cocoa/toolbar_controller.mm:561: BOOL rightBorderShown =
![wrenchButton_ isHidden];
On 2010/06/15 19:33:19, rohitrao wrote:
> Is this always going to be YES?  Can this logic come out too?
> 
> Maybe file a bug to remove the setRightBorderShown code from the container
view.

Done.

http://codereview.chromium.org/2828005/diff/1/7#newcode597
chrome/browser/cocoa/toolbar_controller.mm:597: CGFloat edgeXPos =
[wrenchButton_ isHidden] ?
On 2010/06/15 19:33:19, rohitrao wrote:
> Same question here.

Done.

http://codereview.chromium.org/2828005/diff/1/8
File chrome/browser/cocoa/toolbar_controller_unittest.mm (left):

http://codereview.chromium.org/2828005/diff/1/8#oldcode216
chrome/browser/cocoa/toolbar_controller_unittest.mm:216: EXPECT_EQ([wrenchButton
isHidden], YES);
On 2010/06/15 19:33:19, rohitrao wrote:
> Should we still be checking that the wrench button is hidden?

We don't check for any of the other toolbar buttons being visible, i'd have to
special case that one, and it doesn't seem worth while.

[rohitrao (OOO until 6-22), 2010-06-15 20:19:52]

LGTM