Merge 41644 - [Mac] Add support for showing extensions in incognito mode, whi...

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "browser_actions_controller.h"
 
 #include <string>
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
@@ skipping 154 matching lines @@
 }
 
 - (void)createButtons {
   // No extensions in incognito mode.
   if (!toolbarModel_)
     return;
 
   NSUInteger i = 0;
   for (ExtensionList::iterator iter = toolbarModel_->begin();
        iter != toolbarModel_->end(); ++iter) {
+    if (![self shouldDisplayBrowserAction:*iter])
+      continue;
+
     [self createActionButtonForExtension:*iter withIndex:i++];
   }
 
   CGFloat width = [self savedWidth];
   // The width will never be 0 (due to the container's minimum size restriction)
   // except when no width has been saved. In this case, set the width to be as
   // if all buttons are shown.
   if (width == 0)
     width = [self containerWidthWithButtonCount:[self buttonCount]];
 
   [containerView_ resizeToWidth:width animate:NO];
 }
 
 - (void)createActionButtonForExtension:(Extension*)extension
                              withIndex:(NSUInteger)index {
   if (!extension->browser_action())
     return;
 
   if (![self shouldDisplayBrowserAction:extension])
     return;
 
+  if (profile_->IsOffTheRecord())
+    index = toolbarModel_->OriginalIndexToIncognito(index);
+
   // Show the container if it's the first button. Otherwise it will be shown
   // already.
   if ([buttons_ count] == 0)
     [containerView_ setHidden:NO];
 
   BrowserActionButton* newButton = [[[BrowserActionButton alloc]
       initWithExtension:extension
                 profile:profile_
                   tabId:[self currentTabId]] autorelease];
   [newButton setTarget:self];
@@ skipping 12 matching lines @@
 
 - (void)removeActionButtonForExtension:(Extension*)extension {
   if (!extension->browser_action())
     return;
 
   NSString* buttonKey = base::SysUTF8ToNSString(extension->id());
   if (!buttonKey)
     return;
 
   BrowserActionButton* button = [buttons_ objectForKey:buttonKey];
-  if (!button) {
-    NOTREACHED();
+  // This could be the case in incognito, where only a subset of extensions are
+  // shown.
+  if (!button)
     return;
-  }
+
   [button removeFromSuperview];
   [buttons_ removeObjectForKey:buttonKey];
   if ([buttons_ count] == 0) {
     // No more buttons? Hide the container.
     [containerView_ setHidden:YES];
   } else {
     [self repositionActionButtons];
   }
   [containerView_ setNeedsDisplay:YES];
 }
 
 - (void)repositionActionButtons {
   NSUInteger i = 0;
   for (ExtensionList::iterator iter = toolbarModel_->begin();
        iter != toolbarModel_->end(); ++iter) {
+    if (![self shouldDisplayBrowserAction:*iter])
+      continue;
+
     CGFloat xOffset = kGrippyXOffset +
         (i * (kBrowserActionWidth + kBrowserActionButtonPadding));
     NSString* extensionId = base::SysUTF8ToNSString((*iter)->id());
     DCHECK(extensionId);
     if (!extensionId)
       continue;
     BrowserActionButton* button = [buttons_ objectForKey:extensionId];
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.x = xOffset;
     [button setFrame:buttonFrame];
@@ skipping 10 matching lines @@
   return width;
 }
 
 // Resizes the container given the number of visible buttons in the container,
 // taking into account the size of the grippy. Also updates the persistent
 // width preference.
 - (void)resizeContainerWithAnimation:(BOOL)animate {
   CGFloat width =
       [self containerWidthWithButtonCount:[self visibleButtonCount]];
   [containerView_ resizeToWidth:width animate:animate];
-  profile_->GetPrefs()->SetReal(prefs::kBrowserActionContainerWidth,
-      NSWidth([containerView_ frame]));
+
+  if (!profile_->IsOffTheRecord())
+    profile_->GetPrefs()->SetReal(prefs::kBrowserActionContainerWidth,
+        NSWidth([containerView_ frame]));
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionVisibilityChangedNotification
                     object:self];
 }
 
 - (void)updateButtonOpacityAndDragAbilities {
   for (BrowserActionButton* button in [buttons_ allValues]) {
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.x += kButtonOpacityLeadPadding;
@@ skipping 116 matching lines @@
        iter != toolbarModel_->end(); ++iter) {
     if (i == index)
       return [buttons_ objectForKey:base::SysUTF8ToNSString((*iter)->id())];
 
     ++i;
   }
   return nil;
 }
 
 - (bool)shouldDisplayBrowserAction:(Extension*)extension {
+  // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->
               IsIncognitoEnabled(extension->id()));
 }
 
 - (CGFloat)savedWidth {
+  // Don't use the standard saved width for incognito until a separate pref is
+  // added.
+  if (profile_->IsOffTheRecord())
+    return 0.0;
+
   return profile_->GetPrefs()->GetReal(prefs::kBrowserActionContainerWidth);
 }
 
 + (void)registerUserPrefs:(PrefService*)prefs {
   prefs->RegisterRealPref(prefs::kBrowserActionContainerWidth, 0);
 }
 
 @end