Initial work on making extensions work in incognito mode.

chrome/browser/gtk/browser_actions_toolbar_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_actions_toolbar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/gtk_util.h"
@@ skipping 314 matching lines @@
 
   int i = 0;
   for (ExtensionList::iterator iter = model_->begin();
        iter != model_->end(); ++iter) {
     CreateButtonForExtension(*iter, i++);
   }
 }
 
 void BrowserActionsToolbarGtk::CreateButtonForExtension(Extension* extension,
                                                         int index) {
+  if (!ShouldDisplayBrowserAction(extension))
+    return;
+
+  if (profile_->IsOffTheRecord())
+    index = model_->OriginalIndexToIncognito(index);
+
   RemoveButtonForExtension(extension);
   linked_ptr<BrowserActionButton> button(
       new BrowserActionButton(this, extension));
   gtk_box_pack_start(GTK_BOX(hbox_.get()), button->widget(), FALSE, FALSE, 0);
   gtk_box_reorder_child(GTK_BOX(hbox_.get()), button->widget(), index);
   gtk_widget_show(button->widget());
   extension_button_map_[extension->id()] = button;
 
   GtkTargetEntry drag_target = GetDragTargetEntry();
   gtk_drag_source_set(button->widget(), GDK_BUTTON1_MASK, &drag_target, 1,
@@ skipping 22 matching lines @@
     UpdateVisibility();
 }
 
 void BrowserActionsToolbarGtk::UpdateVisibility() {
   if (button_count() == 0)
     gtk_widget_hide(widget());
   else
     gtk_widget_show(widget());
 }
 
+bool BrowserActionsToolbarGtk::ShouldDisplayBrowserAction(
+    Extension* extension) {
+  // Only display incognito-enabled extensions while in incognito mode.
+  return (!profile_->IsOffTheRecord() ||
+          profile_->GetExtensionsService()->
+              IsIncognitoEnabled(extension->id()));
+}
+
 void BrowserActionsToolbarGtk::HidePopup() {
   ExtensionPopupGtk* popup = ExtensionPopupGtk::get_current_extension_popup();
   if (popup)
     popup->DestroyPopup();
 }
 
 void BrowserActionsToolbarGtk::BrowserActionAdded(Extension* extension,
                                                   int index) {
   CreateButtonForExtension(extension, index);
 }
 
 void BrowserActionsToolbarGtk::BrowserActionRemoved(Extension* extension) {
   if (drag_button_ != NULL) {
     // Break the current drag.
     gtk_grab_remove(widget());
   }
 
   RemoveButtonForExtension(extension);
 }
 
 void BrowserActionsToolbarGtk::BrowserActionMoved(Extension* extension,
                                                   int index) {
   // We initiated this move action, and have already moved the button.
   if (drag_button_ != NULL)
     return;
 
   BrowserActionButton* button = extension_button_map_[extension->id()].get();
   if (!button) {
-    NOTREACHED();
+    if (ShouldDisplayBrowserAction(extension))
+      NOTREACHED();
     return;
   }
 
+  if (profile_->IsOffTheRecord())
+    index = model_->OriginalIndexToIncognito(index);
+
   gtk_box_reorder_child(GTK_BOX(hbox_.get()), button->widget(), index);
 }
 
 void BrowserActionsToolbarGtk::DragStarted(BrowserActionButton* button,
                                            GdkDragContext* drag_context) {
   // No representation of the widget following the cursor.
   GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
   gtk_drag_set_icon_pixbuf(drag_context, pixbuf, 0, 0);
   g_object_unref(pixbuf);
 
   DCHECK(!drag_button_);
   drag_button_ = button;
 }
 
 gboolean BrowserActionsToolbarGtk::OnDragMotion(GtkWidget* widget,
                                                 GdkDragContext* drag_context,
                                                 gint x, gint y, guint time) {
   // Only handle drags we initiated.
   if (!drag_button_)
     return FALSE;
 
   drop_index_ = x < kButtonSize ? 0 : x / (kButtonSize + kButtonPadding);
+  if (profile_->IsOffTheRecord())
+    drop_index_ = model_->IncognitoIndexToOriginal(drop_index_);
+
   // We will go ahead and reorder the child in order to provide visual feedback
   // to the user. We don't inform the model that it has moved until the drag
   // ends.
   gtk_box_reorder_child(GTK_BOX(hbox_.get()), drag_button_->widget(),
                         drop_index_);
 
   gdk_drag_status(drag_context, GDK_ACTION_MOVE, time);
   return TRUE;
 }
 
@@ skipping 21 matching lines @@
   if (!GTK_WIDGET_TOPLEVEL(toplevel))
     return;
 
   g_signal_connect(toplevel, "set-focus", G_CALLBACK(OnSetFocusThunk), this);
 }
 
 void BrowserActionsToolbarGtk::OnSetFocus() {
   // The focus of the parent window has changed. Close the popup.
   HidePopup();
 }