Add support for a "split" incognito behavior for extensions.

chrome/common/extensions/extension_constants.h

Index: chrome/common/extensions/extension_constants.h
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 97ac7f8e5403385e168f49b5181a8ef14c71878f..c979ab59971c177f93f9279c3d33250ad868cf6e 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -8,208 +8,214 @@
 
 // Keys used in JSON representation of extensions.
 namespace extension_manifest_keys {
-  extern const char* kAllFrames;
-  extern const char* kApp;
-  extern const char* kBackground;
-  extern const char* kBrowserAction;
-  extern const char* kBrowseURLs;
-  extern const char* kChromeURLOverrides;
-  extern const char* kContentScripts;
-  extern const char* kConvertedFromUserScript;
-  extern const char* kCss;
-  extern const char* kCurrentLocale;
-  extern const char* kDefaultLocale;
-  extern const char* kDescription;
-  extern const char* kDevToolsPage;
-  extern const char* kExcludeGlobs;
-  extern const char* kIcons;
-  extern const char* kIncludeGlobs;
-  extern const char* kJs;
-  extern const char* kLaunch;
-  extern const char* kLaunchContainer;
-  extern const char* kLaunchHeight;
-  extern const char* kLaunchLocalPath;
-  extern const char* kLaunchWebURL;
-  extern const char* kLaunchWidth;
-  extern const char* kMatches;
-  extern const char* kMinimumChromeVersion;
-  extern const char* kName;
-  extern const char* kOmniboxKeyword;
-  extern const char* kOptionsPage;
-  extern const char* kPageAction;
-  extern const char* kPageActionDefaultIcon;
-  extern const char* kPageActionDefaultPopup;
-  extern const char* kPageActionDefaultTitle;
-  extern const char* kPageActionIcons;
-  extern const char* kPageActionId;
-  extern const char* kPageActionPopup;
-  extern const char* kPageActionPopupHeight;
-  extern const char* kPageActionPopupPath;
-  extern const char* kPageActions;
-  extern const char* kPermissions;
-  extern const char* kPlugins;
-  extern const char* kPluginsPath;
-  extern const char* kPluginsPublic;
-  extern const char* kPublicKey;
-  extern const char* kRunAt;
-  extern const char* kSignature;
-  extern const char* kTheme;
-  extern const char* kThemeColors;
-  extern const char* kThemeDisplayProperties;
-  extern const char* kThemeImages;
-  extern const char* kThemeTints;
-  extern const char* kToolstripPath;
-  extern const char* kToolstrips;
-  extern const char* kType;
-  extern const char* kUpdateURL;
-  extern const char* kVersion;
-  extern const char* kWebLaunchUrl;
-  extern const char* kWebURLs;
+extern const char* kAllFrames;
+extern const char* kApp;
+extern const char* kBackground;
+extern const char* kBrowserAction;
+extern const char* kBrowseURLs;
+extern const char* kChromeURLOverrides;
+extern const char* kContentScripts;
+extern const char* kConvertedFromUserScript;
+extern const char* kCss;
+extern const char* kCurrentLocale;
+extern const char* kDefaultLocale;
+extern const char* kDescription;
+extern const char* kDevToolsPage;
+extern const char* kExcludeGlobs;
+extern const char* kIcons;
+extern const char* kIncognito;
+extern const char* kIncludeGlobs;
+extern const char* kJs;
+extern const char* kLaunch;
+extern const char* kLaunchContainer;
+extern const char* kLaunchFullscreen;
+extern const char* kLaunchHeight;
+extern const char* kLaunchLocalPath;
+extern const char* kLaunchWebURL;
+extern const char* kLaunchWidth;
+extern const char* kMatches;
+extern const char* kMinimumChromeVersion;
+extern const char* kName;
+extern const char* kOmniboxKeyword;
+extern const char* kOptionsPage;
+extern const char* kPageAction;
+extern const char* kPageActionDefaultIcon;
+extern const char* kPageActionDefaultPopup;
+extern const char* kPageActionDefaultTitle;
+extern const char* kPageActionIcons;
+extern const char* kPageActionId;
+extern const char* kPageActionPopup;
+extern const char* kPageActionPopupHeight;
+extern const char* kPageActionPopupPath;
+extern const char* kPageActions;
+extern const char* kPermissions;
+extern const char* kPlugins;
+extern const char* kPluginsPath;
+extern const char* kPluginsPublic;
+extern const char* kPublicKey;
+extern const char* kRunAt;
+extern const char* kSignature;
+extern const char* kTheme;
+extern const char* kThemeColors;
+extern const char* kThemeDisplayProperties;
+extern const char* kThemeImages;
+extern const char* kThemeTints;
+extern const char* kToolstripPath;
+extern const char* kToolstrips;
+extern const char* kType;
+extern const char* kUpdateURL;
+extern const char* kVersion;
+extern const char* kWebLaunchUrl;
+extern const char* kWebURLs;
 }  // namespace extension_manifest_keys
 
 // Some values expected in manifests.
 namespace extension_manifest_values {
-  extern const char* kLaunchContainerPanel;
-  extern const char* kLaunchContainerTab;
-  extern const char* kLaunchContainerWindow;
-  extern const char* kPageActionTypePermanent;
-  extern const char* kPageActionTypeTab;
-  extern const char* kRunAtDocumentEnd;
-  extern const char* kRunAtDocumentIdle;
-  extern const char* kRunAtDocumentStart;
+extern const char* kIncognitoSplit;
+extern const char* kIncognitoSpanning;
+extern const char* kLaunchContainerPanel;
+extern const char* kLaunchContainerTab;
+extern const char* kLaunchContainerWindow;
+extern const char* kPageActionTypePermanent;
+extern const char* kPageActionTypeTab;
+extern const char* kRunAtDocumentEnd;
+extern const char* kRunAtDocumentIdle;
+extern const char* kRunAtDocumentStart;
 }  // namespace extension_manifest_values
 
 // Error messages returned from Extension::InitFromValue().
 namespace extension_manifest_errors {
-  extern const char* kAppsNotEnabled;
-  extern const char* kCannotAccessPage;
-  extern const char* kCannotScriptGallery;
-  extern const char* kChromeVersionTooLow;
-  extern const char* kDevToolsExperimental;
-  extern const char* kHostedAppsCannotIncludeExtensionFeatures;
-  extern const char* kInvalidAllFrames;
-  extern const char* kInvalidBackground;
-  extern const char* kInvalidBrowserAction;
-  extern const char* kInvalidBrowseURL;
-  extern const char* kInvalidBrowseURLs;
-  extern const char* kInvalidChromeURLOverrides;
-  extern const char* kInvalidContentScript;
-  extern const char* kInvalidContentScriptsList;
-  extern const char* kInvalidCss;
-  extern const char* kInvalidCssList;
-  extern const char* kInvalidDefaultLocale;
-  extern const char* kInvalidDescription;
-  extern const char* kDisabledByPolicy;
-  extern const char* kInvalidDevToolsPage;
-  extern const char* kInvalidGlob;
-  extern const char* kInvalidGlobList;
-  extern const char* kInvalidIconPath;
-  extern const char* kInvalidIcons;
-  extern const char* kInvalidJs;
-  extern const char* kInvalidJsList;
-  extern const char* kInvalidKey;
-  extern const char* kInvalidLaunchContainer;
-  extern const char* kInvalidLaunchHeight;
-  extern const char* kInvalidLaunchHeightContainer;
-  extern const char* kInvalidLaunchLocalPath;
-  extern const char* kInvalidLaunchWebURL;
-  extern const char* kInvalidLaunchWidth;
-  extern const char* kInvalidLaunchWidthContainer;
-  extern const char* kInvalidManifest;
-  extern const char* kInvalidMatch;
-  extern const char* kInvalidMatchCount;
-  extern const char* kInvalidMatches;
-  extern const char* kInvalidMinimumChromeVersion;
-  extern const char* kInvalidName;
-  extern const char* kInvalidOmniboxKeyword;
-  extern const char* kInvalidOptionsPage;
-  extern const char* kInvalidPageAction;
-  extern const char* kInvalidPageActionDefaultTitle;
-  extern const char* kInvalidPageActionIconPath;
-  extern const char* kInvalidPageActionId;
-  extern const char* kInvalidPageActionName;
-  extern const char* kInvalidPageActionOldAndNewKeys;
-  extern const char* kInvalidPageActionPopup;
-  extern const char* kInvalidPageActionPopupHeight;
-  extern const char* kInvalidPageActionPopupPath;
-  extern const char* kInvalidPageActionsList;
-  extern const char* kInvalidPageActionsListSize;
-  extern const char* kInvalidPageActionTypeValue;
-  extern const char* kInvalidPermission;
-  extern const char* kInvalidPermissions;
-  extern const char* kInvalidPermissionScheme;
-  extern const char* kInvalidPlugins;
-  extern const char* kInvalidPluginsPath;
-  extern const char* kInvalidPluginsPublic;
-  extern const char* kInvalidRunAt;
-  extern const char* kInvalidSignature;
-  extern const char* kInvalidTheme;
-  extern const char* kInvalidThemeColors;
-  extern const char* kInvalidThemeImages;
-  extern const char* kInvalidThemeImagesMissing;
-  extern const char* kInvalidThemeTints;
-  extern const char* kInvalidToolstrip;
-  extern const char* kInvalidToolstrips;
-  extern const char* kInvalidUpdateURL;
-  extern const char* kInvalidVersion;
-  extern const char* kInvalidWebURL;
-  extern const char* kInvalidWebURLs;
-  extern const char* kInvalidZipHash;
-  extern const char* kLaunchPathAndURLAreExclusive;
-  extern const char* kLaunchURLRequired;
-  extern const char* kLocalesMessagesFileMissing;
-  extern const char* kLocalesNoDefaultLocaleSpecified;
-  extern const char* kLocalesNoDefaultMessages;
-  extern const char* kLocalesNoValidLocaleNamesListed;
-  extern const char* kLocalesTreeMissing;
-  extern const char* kManifestParseError;
-  extern const char* kManifestUnreadable;
-  extern const char* kMissingFile;
-  extern const char* kMultipleOverrides;
-  extern const char* kOmniboxExperimental;
-  extern const char* kOneUISurfaceOnly;
-  extern const char* kReservedMessageFound;
-  extern const char* kThemesCannotContainExtensions;
-  extern const char* kWebContentMustBeEnabled;
+extern const char* kAppsNotEnabled;
+extern const char* kCannotAccessPage;
+extern const char* kCannotScriptGallery;
+extern const char* kChromeVersionTooLow;
+extern const char* kDevToolsExperimental;
+extern const char* kHostedAppsCannotIncludeExtensionFeatures;
+extern const char* kInvalidAllFrames;
+extern const char* kInvalidBackground;
+extern const char* kInvalidBrowserAction;
+extern const char* kInvalidBrowseURL;
+extern const char* kInvalidBrowseURLs;
+extern const char* kInvalidChromeURLOverrides;
+extern const char* kInvalidContentScript;
+extern const char* kInvalidContentScriptsList;
+extern const char* kInvalidCss;
+extern const char* kInvalidCssList;
+extern const char* kInvalidDefaultLocale;
+extern const char* kInvalidDescription;
+extern const char* kDisabledByPolicy;
+extern const char* kInvalidDevToolsPage;
+extern const char* kInvalidGlob;
+extern const char* kInvalidGlobList;
+extern const char* kInvalidIconPath;
+extern const char* kInvalidIcons;
+extern const char* kInvalidIncognitoBehavior;
+extern const char* kInvalidJs;
+extern const char* kInvalidJsList;
+extern const char* kInvalidKey;
+extern const char* kInvalidLaunchContainer;
+extern const char* kInvalidLaunchFullscreen;
+extern const char* kInvalidLaunchHeight;
+extern const char* kInvalidLaunchHeightContainer;
+extern const char* kInvalidLaunchLocalPath;
+extern const char* kInvalidLaunchWebURL;
+extern const char* kInvalidLaunchWidth;
+extern const char* kInvalidLaunchWidthContainer;
+extern const char* kInvalidManifest;
+extern const char* kInvalidMatch;
+extern const char* kInvalidMatchCount;
+extern const char* kInvalidMatches;
+extern const char* kInvalidMinimumChromeVersion;
+extern const char* kInvalidName;
+extern const char* kInvalidOmniboxKeyword;
+extern const char* kInvalidOptionsPage;
+extern const char* kInvalidPageAction;
+extern const char* kInvalidPageActionDefaultTitle;
+extern const char* kInvalidPageActionIconPath;
+extern const char* kInvalidPageActionId;
+extern const char* kInvalidPageActionName;
+extern const char* kInvalidPageActionOldAndNewKeys;
+extern const char* kInvalidPageActionPopup;
+extern const char* kInvalidPageActionPopupHeight;
+extern const char* kInvalidPageActionPopupPath;
+extern const char* kInvalidPageActionsList;
+extern const char* kInvalidPageActionsListSize;
+extern const char* kInvalidPageActionTypeValue;
+extern const char* kInvalidPermission;
+extern const char* kInvalidPermissions;
+extern const char* kInvalidPermissionScheme;
+extern const char* kInvalidPlugins;
+extern const char* kInvalidPluginsPath;
+extern const char* kInvalidPluginsPublic;
+extern const char* kInvalidRunAt;
+extern const char* kInvalidSignature;
+extern const char* kInvalidTheme;
+extern const char* kInvalidThemeColors;
+extern const char* kInvalidThemeImages;
+extern const char* kInvalidThemeImagesMissing;
+extern const char* kInvalidThemeTints;
+extern const char* kInvalidToolstrip;
+extern const char* kInvalidToolstrips;
+extern const char* kInvalidUpdateURL;
+extern const char* kInvalidVersion;
+extern const char* kInvalidWebURL;
+extern const char* kInvalidWebURLs;
+extern const char* kInvalidZipHash;
+extern const char* kLaunchPathAndURLAreExclusive;
+extern const char* kLaunchURLRequired;
+extern const char* kLocalesMessagesFileMissing;
+extern const char* kLocalesNoDefaultLocaleSpecified;
+extern const char* kLocalesNoDefaultMessages;
+extern const char* kLocalesNoValidLocaleNamesListed;
+extern const char* kLocalesTreeMissing;
+extern const char* kManifestParseError;
+extern const char* kManifestUnreadable;
+extern const char* kMissingFile;
+extern const char* kMultipleOverrides;
+extern const char* kOmniboxExperimental;
+extern const char* kOneUISurfaceOnly;
+extern const char* kReservedMessageFound;
+extern const char* kThemesCannotContainExtensions;
+extern const char* kWebContentMustBeEnabled;
 #if defined(OS_CHROMEOS)
-  extern const char* kIllegalPlugins;
+extern const char* kIllegalPlugins;
 #endif
 }  // namespace extension_manifest_errors
 
 namespace extension_urls {
-  // The greatest common prefixes of the main extensions gallery's browse and
-  // download URLs.
-  extern const char* kGalleryBrowsePrefix;
-  extern const char* kGalleryDownloadPrefix;
+// The greatest common prefixes of the main extensions gallery's browse and
+// download URLs.
+extern const char* kGalleryBrowsePrefix;
+extern const char* kGalleryDownloadPrefix;
 
-  // The update urls used by gallery/webstore extensions.
-  extern const char* kGalleryUpdateHttpUrl;
-  extern const char* kGalleryUpdateHttpsUrl;
+// The update urls used by gallery/webstore extensions.
+extern const char* kGalleryUpdateHttpUrl;
+extern const char* kGalleryUpdateHttpsUrl;
 
-  // Same thing for the "minigallery". The minigallery is the temporary static
-  // themes gallery that we put up when we launched themes.
-  extern const char* kMiniGalleryBrowsePrefix;
-  extern const char* kMiniGalleryDownloadPrefix;
+// Same thing for the "minigallery". The minigallery is the temporary static
+// themes gallery that we put up when we launched themes.
+extern const char* kMiniGalleryBrowsePrefix;
+extern const char* kMiniGalleryDownloadPrefix;
 }  // namespace extension_urls
 
 namespace extension_filenames {
-  // The name of a temporary directory to install an extension into for
-  // validation before finalizing install.
-  extern const char* kTempExtensionName;
+// The name of a temporary directory to install an extension into for
+// validation before finalizing install.
+extern const char* kTempExtensionName;
 
-  // The file to write our decoded images to, relative to the extension_path.
-  extern const char* kDecodedImagesFilename;
+// The file to write our decoded images to, relative to the extension_path.
+extern const char* kDecodedImagesFilename;
 
-  // The file to write our decoded message catalogs to, relative to the
-  // extension_path.
-  extern const char* kDecodedMessageCatalogsFilename;
+// The file to write our decoded message catalogs to, relative to the
+// extension_path.
+extern const char* kDecodedMessageCatalogsFilename;
 }
 
 namespace extension_misc {
-  const int kUnknownWindowId = -1;
+const int kUnknownWindowId = -1;
 
-  // The extension id of the bookmark manager.
-  extern const char* kBookmarkManagerId;
+// The extension id of the bookmark manager.
+extern const char* kBookmarkManagerId;
 
   // The extension id of the Web Store component application.
   extern const char* kWebStoreAppId;