Initial work on making extensions work in incognito mode.

chrome/browser/extensions/extension_toolbar_model.h

Index: chrome/browser/extensions/extension_toolbar_model.h
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index 171805066732fbe5f4045cfcd1c90fd803ac89b7..a4c785563c1e9edef79fba4a486212717d8ba0c3 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -50,6 +50,11 @@ class ExtensionToolbarModel : public NotificationObserver {
     return toolitems_.end();
   }
 
+  // Utility functions for converting between an index into the list of
+  // incognito-enabled browser actions, and the list of all browser actions.
+  int IncognitoIndexToOriginal(int incognito_index);
+  int OriginalIndexToIncognito(int original_index);
+
  private:
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,