[Extensions Toolbar] Fix an issue where incognito extensions were overflowed

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
@@ skipping 663 matching lines @@
           browser_,
           extensions::ExtensionActionManager::Get(browser_->profile())->
               GetExtensionAction(*extension)));
 
   delegate_->AddViewForAction(toolbar_actions_[index], index);
 
   // If we are still initializing the container, don't bother animating.
   if (!model_->extensions_initialized())
     return;
 
-  // If this is just an upgrade, then don't worry about resizing.
-  if (extensions::ExtensionSystem::Get(browser_->profile())->runtime_data()->
-          IsBeingUpgraded(extension->id())) {
-    delegate_->Redraw(false);
-  } else {
-    // We may need to resize (e.g. to show the new icon, or the chevron).
-    // We suppress the chevron during animation because, if we're expanding to
-    // show a new icon, we don't want to have the chevron visible only for the
-    // duration of the animation.
-    ResizeDelegate(gfx::Tween::LINEAR, true);
-  }
+  // We may need to resize (e.g. to show the new icon, or the chevron). We don't
+  // need to check if the extension is upgrading here, because ResizeDelegate()
+  // checks to see if the container is already the proper size, and because
+  // if the action is newly incognito enabled, even though it's a reload, it's
+  // a new extension to this toolbar.
+  // We suppress the chevron during animation because, if we're expanding to
+  // show a new icon, we don't want to have the chevron visible only for the
+  // duration of the animation.
+  ResizeDelegate(gfx::Tween::LINEAR, true);
 }
 
 void ToolbarActionsBar::ToolbarExtensionRemoved(
     const extensions::Extension* extension) {
   ToolbarActions::iterator iter = toolbar_actions_.begin();
   while (iter != toolbar_actions_.end() && (*iter)->GetId() != extension->id())
     ++iter;
 
   if (iter == toolbar_actions_.end())
     return;
 
   delegate_->RemoveViewForAction(*iter);
   if (tab_order_helper_)
     tab_order_helper_->ActionRemoved(*iter);
   toolbar_actions_.erase(iter);
 
   // If the extension is being upgraded we don't want the bar to shrink
   // because the icon is just going to get re-added to the same location.
+  // There is an exception if this is an off-the-record profile, and the
+  // extension is no longer incognito-enabled.
   if (!extensions::ExtensionSystem::Get(browser_->profile())->runtime_data()->
-            IsBeingUpgraded(extension->id())) {
+            IsBeingUpgraded(extension->id()) ||
+      (browser_->profile()->IsOffTheRecord() &&
+       !extensions::util::IsIncognitoEnabled(extension->id(),
+                                             browser_->profile()))) {
     if (toolbar_actions_.size() > model_->visible_icon_count()) {
       // If we have more icons than we can show, then we must not be changing
       // the container size (since we either removed an icon from the main
       // area and one from the overflow list will have shifted in, or we
       // removed an entry directly from the overflow list).
       delegate_->Redraw(false);
     } else {
       delegate_->SetChevronVisibility(false);
       // Either we went from overflow to no-overflow, or we shrunk the no-
       // overflow container by 1.  Either way the size changed, so animate.
@@ skipping 127 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }