[Mac] Do not take Browser Actions Container view changes into account in inco...

[Mac] Add support for showing extensions in incognito mode, while fixing a bug where the Browser Actions container was displayed and sized in a popup window.

TEST=none.
BUG=38094
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=41644

[pink (ping after 24hrs), 2010-03-15 19:03:59]

lgtm

[Matt Perry, 2010-03-15 19:17:55]

http://codereview.chromium.org/1001001/diff/1/3
File chrome/browser/cocoa/browser_window_controller.mm (right):

http://codereview.chromium.org/1001001/diff/1/3#newcode303
chrome/browser/cocoa/browser_window_controller.mm:303: if ([self hasToolbar] &&
!browser_->profile()->IsOffTheRecord())
This won't work if extensions are enabled for incognito (currently hidden behind
a flag, but not for long). A user can opt-in to enable 0 or more of his
extensions in incognito. On windows this is handled by always creating the
browser action container, but sizing it so that only the enabled buttons are
visible. See BrowserActionsContainer::ShouldDisplayBrowserAction.

Since ExtensionToolbarModel holds all the extensions, I needed to do index
conversions too (to handle the mapping between the ExtensionToolbarModel's
indicies and the ones enabled in incognito), which you can see in
ExtensionToolbarModel::IncognitoIndexToOriginal.

If the real fix is too much, you can go ahead with this for now, and send the
bug to me to finish it.

[Bons, 2010-03-15 19:20:38]

On 2010/03/15 19:17:55, Matt Perry wrote:
> http://codereview.chromium.org/1001001/diff/1/3
> File chrome/browser/cocoa/browser_window_controller.mm (right):
> 
> http://codereview.chromium.org/1001001/diff/1/3#newcode303
> chrome/browser/cocoa/browser_window_controller.mm:303: if ([self hasToolbar]
&&
> !browser_->profile()->IsOffTheRecord())
> This won't work if extensions are enabled for incognito (currently hidden
behind
> a flag, but not for long). A user can opt-in to enable 0 or more of his
> extensions in incognito. On windows this is handled by always creating the
> browser action container, but sizing it so that only the enabled buttons are
> visible. See BrowserActionsContainer::ShouldDisplayBrowserAction.
> 
> Since ExtensionToolbarModel holds all the extensions, I needed to do index
> conversions too (to handle the mapping between the ExtensionToolbarModel's
> indicies and the ones enabled in incognito), which you can see in
> ExtensionToolbarModel::IncognitoIndexToOriginal.
> 
> If the real fix is too much, you can go ahead with this for now, and send the
> bug to me to finish it.
Extensions aren't supported in incognito mode yet on the Mac. That's something
that needs to go on my plate (or yours, if you feel you're better suited :) This
fix is for the interim.

[Matt Perry, 2010-03-15 21:03:46]

LGTM