skeleton for webrequest

3 files changed, 2010 insertions, 2485 deletions

diff --git a/lib/decl/chrome/chrome.d.ts b/lib/decl/chrome/chrome.d.ts
index 77d2898fd..dbf6a1244 100755
--- a/lib/decl/chrome/chrome.d.ts
+++ b/lib/decl/chrome/chrome.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for Chrome extension development
 // Project: http://developer.chrome.com/extensions/
-// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path='../webrtc/MediaStream.d.ts'/>
 /// <reference path='../filesystem/filesystem.d.ts' />
@@ -18,11 +18,11 @@ interface Window {
 ////////////////////
 /**
  * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
- * Availability: Since Chrome 37.  
+ * Availability: Since Chrome 37.
  * Permissions: "accessibilityFeatures.read"
  * Important: This API works only on Chrome OS.
  */
-declare module chrome.accessibilityFeatures {
+declare namespace chrome.accessibilityFeatures {
 	interface AccessibilityFeaturesGetArg {
 		/** Optional. Whether to return the value that applies to the incognito session (default false).  */
 		incognito?: boolean;
@@ -45,8 +45,8 @@ declare module chrome.accessibilityFeatures {
 
 	interface AccessibilityFeaturesSetArg {
 		/**
-		 * The value of the setting. 
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type. 
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
 		 */
 		value: any;
 		/**
@@ -112,11 +112,11 @@ declare module chrome.accessibilityFeatures {
 // Alarms
 ////////////////////
 /**
- * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future. 
+ * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
  * Availability: Since Chrome 22.
  * Permissions:  "alarms"
  */
-declare module chrome.alarms {
+declare namespace chrome.alarms {
     interface AlarmCreateInfo {
 		/** Optional. Length of time in minutes after which the onAlarm event should fire.  */
         delayInMinutes?: number;
@@ -135,65 +135,59 @@ declare module chrome.alarms {
         name: string;
     }
 
-    interface AlarmEvent extends chrome.events.Event {
-		/**
-		 * The callback parameter should be a function that looks like this:
-		 * function( Alarm alarm) {...}; 
-		 */
-        addListener(callback: (alarm: Alarm) => void): void;
-    }
+    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
 
 	/**
 	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
 	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
 	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
 	 */
     export function create(alarmInfo: AlarmCreateInfo): void;
 	/**
 	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
 	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
 	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param name Optional name to identify this alarm. Defaults to the empty string. 
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
+	 * @param name Optional name to identify this alarm. Defaults to the empty string.
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
 	 */
     export function create(name: string, alarmInfo: AlarmCreateInfo): void;
 	/**
-	 * Gets an array of all the alarms. 
+	 * Gets an array of all the alarms.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of Alarm alarms) {...}; 
+	 * function(array of Alarm alarms) {...};
 	 */
     export function getAll(callback: (alarms: Alarm[]) => void): void;
 	/**
-	 * Clears all alarms. 
+	 * Clears all alarms.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clearAll(callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Clears the alarm with the given name. 
-	 * @param name The name of the alarm to clear. Defaults to the empty string. 
+	 * Clears the alarm with the given name.
+	 * @param name The name of the alarm to clear. Defaults to the empty string.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Clears the alarm without a name. 
+	 * Clears the alarm without a name.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clear(callback: (wasCleared: boolean) => void): void;
 	/**
-	 * Retrieves details about the specified alarm. 
+	 * Retrieves details about the specified alarm.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...}; 
+	 * function( Alarm alarm) {...};
 	 */
     export function get(callback: (alarm: Alarm) => void): void;
 	/**
-	 * Retrieves details about the specified alarm. 
+	 * Retrieves details about the specified alarm.
 	 * @param name The name of the alarm to get. Defaults to the empty string.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...}; 
+	 * function( Alarm alarm) {...};
 	 */
     export function get(name: string, callback: (alarm: Alarm) => void): void;
 
@@ -202,30 +196,30 @@ declare module chrome.alarms {
 }
 
 /**
- * Use the chrome.browser API to interact with the Chrome browser associated with 
- * the current application and Chrome profile. 
+ * Use the chrome.browser API to interact with the Chrome browser associated with
+ * the current application and Chrome profile.
  */
-declare module chrome.browser {
+declare namespace chrome.browser {
     interface Options {
         /** The URL to navigate to when the new tab is initially opened. */
         url: string;
     }
-    
+
     /**
-     * Opens a new tab in a browser window associated with the current application 
-     * and Chrome profile. If no browser window for the Chrome profile is opened, 
-     * a new one is opened prior to creating the new tab. 
-     * @param options Configures how the tab should be opened. 
-     * @param callback Called when the tab was successfully 
+     * Opens a new tab in a browser window associated with the current application
+     * and Chrome profile. If no browser window for the Chrome profile is opened,
+     * a new one is opened prior to creating the new tab.
+     * @param options Configures how the tab should be opened.
+     * @param callback Called when the tab was successfully
      * created, or failed to be created. If failed, runtime.lastError will be set.
      */
     export function openTab(options: Options, callback: () => void): void;
-     
+
 	/**
-	* Opens a new tab in a browser window associated with the current application 
-	* and Chrome profile. If no browser window for the Chrome profile is opened, 
-	* a new one is opened prior to creating the new tab. Since Chrome 42 only. 
-	* @param options Configures how the tab should be opened. 
+	* Opens a new tab in a browser window associated with the current application
+	* and Chrome profile. If no browser window for the Chrome profile is opened,
+	* a new one is opened prior to creating the new tab. Since Chrome 42 only.
+	* @param options Configures how the tab should be opened.
 	*/
     export function openTab(options: Options): void;
 }
@@ -234,11 +228,11 @@ declare module chrome.browser {
 // Bookmarks
 ////////////////////
 /**
- * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page. 
- * Availability: Since Chrome 5.  
- * Permissions:  "bookmarks"   
+ * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page.
+ * Availability: Since Chrome 5.
+ * Permissions:  "bookmarks"
  */
-declare module chrome.bookmarks {
+declare namespace chrome.bookmarks {
 	/** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
     interface BookmarkTreeNode {
 		/** Optional. The 0-based position of this node within its parent folder.  */
@@ -259,8 +253,8 @@ declare module chrome.bookmarks {
         children?: BookmarkTreeNode[];
 		/**
 		 * Optional.
- 		 * Since Chrome 37. 
-		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default). 
+ 		 * Since Chrome 37.
+		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default).
 		 */
 		unmodifiable?: any;
     }
@@ -286,61 +280,19 @@ declare module chrome.bookmarks {
         childIds: string[];
     }
 
-    interface BookmarkRemovedEvent extends chrome.events.Event {
-		/** 
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(string id, object removeInfo) {...};  
-		 */
-        addListener(callback: (id: string, removeInfo: BookmarkRemoveInfo) => void): void;
-    }
+    interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
 
-    interface BookmarkImportEndedEvent extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-    }
+    interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
 
-    interface BookmarkMovedEvent extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id, object moveInfo) {...}; 
-		 */
-        addListener(callback: (id: string, moveInfo: BookmarkMoveInfo) => void): void;
-    }
+    interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
 
-    interface BookmarkImportBeganEvent extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-    }
+    interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
 
-    interface BookmarkChangedEvent extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id, object changeInfo) {...}; 
-		 */
-        addListener(callback: (id: string, changeInfo: BookmarkChangeInfo) => void): void;
-    }
+    interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
 
-    interface BookmarkCreatedEvent extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id, BookmarkTreeNode bookmark) {...}; 
-		 */
-        addListener(callback: (id: string, bookmark: BookmarkTreeNode) => void): void;
-    }
+    interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
 
-    interface BookmarkChildrenReordered extends chrome.events.Event {
-        /** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id, object reorderInfo) {...}; 
-		 */
-        addListener(callback: (id: string, reorderInfo: BookmarkReorderInfo) => void): void;
-    }
+    interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
 
 	interface BookmarkSearchQuery {
 		query?: string;
@@ -365,95 +317,95 @@ declare module chrome.bookmarks {
 		title?: string;
 		url?: string;
 	}
-	
+
 	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
     var MAX_WRITE_OPERATIONS_PER_HOUR: number;
 	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
     var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
 
 	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
 	 * @param query A string of words and quoted phrases that are matched against bookmark URLs and titles.
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
-	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
+	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
 	export function search(query: BookmarkSearchQuery, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Retrieves the entire Bookmarks hierarchy. 
+	 * Retrieves the entire Bookmarks hierarchy.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getTree(callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Retrieves the recently added bookmarks. 
-	 * @param numberOfItems The maximum number of items to return. 
+	 * Retrieves the recently added bookmarks.
+	 * @param numberOfItems The maximum number of items to return.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getRecent(numberOfItems: number, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
 	 * Retrieves the specified BookmarkTreeNode.
 	 * @param id A single string-valued id
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function get(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
 	 * Retrieves the specified BookmarkTreeNode.
 	 * @param idList An array of string-valued ids
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function get(idList: string[], callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder. 
+	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function create(bookmark: BookmarkCreateArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Moves the specified BookmarkTreeNode to the provided location. 
+	 * Moves the specified BookmarkTreeNode to the provided location.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function move(id: string, destination: BookmarkDestinationArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported. 
+	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function update(id: string, changes: BookmarkChangesArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Removes a bookmark or an empty bookmark folder. 
+	 * Removes a bookmark or an empty bookmark folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
     export function remove(id: string, callback?: Function): void;
 	/**
-	 * Retrieves the children of the specified BookmarkTreeNode id. 
+	 * Retrieves the children of the specified BookmarkTreeNode id.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getChildren(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Since Chrome 14. 
-	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node. 
-	 * @param id The ID of the root of the subtree to retrieve. 
+	 * Since Chrome 14.
+	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node.
+	 * @param id The ID of the root of the subtree to retrieve.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getSubTree(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Recursively removes a bookmark folder. 
+	 * Recursively removes a bookmark folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
     export function removeTree(id: string, callback?: Function): void;
 
@@ -478,10 +430,10 @@ declare module chrome.bookmarks {
 ////////////////////
 /**
  * Use browser actions to put icons in the main Google Chrome toolbar, to the right of the address bar. In addition to its icon, a browser action can also have a tooltip, a badge, and a popup.
- * Availability: Since Chrome 5.  
- * Manifest:  "browser_action": {...}   
+ * Availability: Since Chrome 5.
+ * Manifest:  "browser_action": {...}
  */
-declare module chrome.browserAction {
+declare namespace chrome.browserAction {
     interface BadgeBackgroundColorDetails {
 		/** An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is [255, 0, 0, 255]. Can also be a string with a CSS value, with opaque red being #FF0000 or #F00. */
         color: any;
@@ -524,18 +476,12 @@ declare module chrome.browserAction {
         popup: string;
     }
 
-    interface BrowserClickedEvent extends chrome.events.Event {
-		/** 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( tabs.Tab tab) {...}; 
-		 */
-        addListener(callback: (tab: chrome.tabs.Tab) => void): void;
-    }
+    interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
 	/**
-	 * Since Chrome 22. 
-	 * Enables the browser action for a tab. By default, browser actions are enabled. 
-	 * @param tabId The id of the tab for which you want to modify the browser action. 
+	 * Since Chrome 22.
+	 * Enables the browser action for a tab. By default, browser actions are enabled.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
 	 */
     export function enable(tabId?: number): void;
 	/** Sets the background color for the badge. */
@@ -545,45 +491,45 @@ declare module chrome.browserAction {
 	/** Sets the title of the browser action. This shows up in the tooltip. */
     export function setTitle(details: TitleDetails): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getBadgeText(details: TabDetails, callback: (result: string) => void): void;
 	/** Sets the html document to be opened as a popup when the user clicks on the browser action's icon. */
     export function setPopup(details: PopupDetails): void;
 	/**
-	 * Since Chrome 22. 
-	 * Disables the browser action for a tab. 
-	 * @param tabId The id of the tab for which you want to modify the browser action. 
+	 * Since Chrome 22.
+	 * Disables the browser action for a tab.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
 	 */
     export function disable(tabId?: number): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the title of the browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the title of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getTitle(details: TabDetails, callback: (result: string) => void): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the background color of the browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( ColorArray result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the background color of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( ColorArray result) {...};
 	 */
     export function getBadgeBackgroundColor(details: TabDetails, callback: (result: number[]) => void): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the html document set as the popup for this browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the html document set as the popup for this browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getPopup(details: TabDetails, callback: (result: string) => void): void;
 	/**
-	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setIcon(details: TabIconDetails, callback?: Function): void;
 
@@ -595,11 +541,11 @@ declare module chrome.browserAction {
 // Browsing Data
 ////////////////////
 /**
- * Use the chrome.browsingData API to remove browsing data from a user's local profile. 
- * Availability: Since Chrome 19.  
- * Permissions:  "browsingData"   
+ * Use the chrome.browsingData API to remove browsing data from a user's local profile.
+ * Availability: Since Chrome 19.
+ * Permissions:  "browsingData"
  */
-declare module chrome.browsingData {
+declare namespace chrome.browsingData {
     interface OriginTypes {
 		/** Optional. Websites that have been installed as hosted applications (be careful!).  */
         protectedWeb?: boolean;
@@ -613,8 +559,8 @@ declare module chrome.browsingData {
     interface RemovalOptions {
 		/**
 		 * Optional.
- 		 * Since Chrome 21. 
-		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'. 
+ 		 * Since Chrome 21.
+		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'.
 		 */
         originTypes?: OriginTypes;
 		/** Optional. Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).  */
@@ -622,7 +568,7 @@ declare module chrome.browsingData {
     }
 
 	/**
-	 * Since Chrome 27. 
+	 * Since Chrome 27.
 	 * A set of data types. Missing data types are interpreted as false.
 	 */
     interface DataTypeSet {
@@ -654,8 +600,8 @@ declare module chrome.browsingData {
         history?: boolean;
 		/**
 		 * Optional.
- 		 * Since Chrome 39. 
-		 * Service Workers. 
+ 		 * Since Chrome 39.
+		 * Service Workers.
 		 */
 		serviceWorkers?: boolean;
     }
@@ -669,102 +615,102 @@ declare module chrome.browsingData {
 	}
 
 	/**
-	 * Since Chrome 26. 
-	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Since Chrome 26.
+	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function settings(callback: (result: SettingsCallback) => void): void;
 	/**
-	 * Clears plugins' data. 
-	 * @param callback Called when plugins' data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears plugins' data.
+	 * @param callback Called when plugins' data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removePluginData(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's stored form data (autofill). 
-	 * @param callback Called when the browser's form data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's stored form data (autofill).
+	 * @param callback Called when the browser's form data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFormData(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' file system data. 
-	 * @param callback Called when websites' file systems have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' file system data.
+	 * @param callback Called when websites' file systems have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFileSystems(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears various types of browsing data stored in a user's profile. 
-	 * @param dataToRemove The set of data types to remove. 
-	 * @param callback Called when deletion has completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears various types of browsing data stored in a user's profile.
+	 * @param dataToRemove The set of data types to remove.
+	 * @param callback Called when deletion has completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function remove(options: RemovalOptions, dataToRemove: DataTypeSet, callback?: () => void): void;
 	/**
-	 * Clears the browser's stored passwords. 
-	 * @param callback Called when the browser's passwords have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's stored passwords.
+	 * @param callback Called when the browser's passwords have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removePasswords(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe. 
-	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe.
+	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeCookies(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' WebSQL data. 
-	 * @param callback Called when websites' WebSQL databases have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' WebSQL data.
+	 * @param callback Called when websites' WebSQL databases have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeWebSQL(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' appcache data. 
-	 * @param callback Called when websites' appcache data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' appcache data.
+	 * @param callback Called when websites' appcache data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeAppcache(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's list of downloaded files (not the downloaded files themselves). 
-	 * @param callback Called when the browser's list of downloaded files has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's list of downloaded files (not the downloaded files themselves).
+	 * @param callback Called when the browser's list of downloaded files has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeDownloads(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' local storage data. 
-	 * @param callback Called when websites' local storage has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' local storage data.
+	 * @param callback Called when websites' local storage has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeLocalStorage(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's cache. 
-	 * @param callback Called when the browser's cache has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's cache.
+	 * @param callback Called when the browser's cache has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeCache(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's history. 
-	 * @param callback Called when the browser's history has cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's history.
+	 * @param callback Called when the browser's history has cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeHistory(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' IndexedDB data. 
-	 * @param callback Called when websites' IndexedDB data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' IndexedDB data.
+	 * @param callback Called when websites' IndexedDB data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeIndexedDB(options: RemovalOptions, callback?: () => void): void;
 }
@@ -773,11 +719,11 @@ declare module chrome.browsingData {
 // Commands
 ////////////////////
 /**
- * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension. 
- * Availability: Since Chrome 25.  
- * Manifest:  "commands": {...}   
+ * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+ * Availability: Since Chrome 25.
+ * Manifest:  "commands": {...}
  */
-declare module chrome.commands {
+declare namespace chrome.commands {
 	interface Command {
 		/** Optional. The name of the Extension Command  */
 		name?: string;
@@ -787,19 +733,13 @@ declare module chrome.commands {
 		shortcut?: string;
 	}
 
-    interface CommandEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string command) {...}; 
-		 */
-        addListener(callback: (command: string) => void): void;
-    }
+    interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
 
 	/**
-	 * Returns all the registered extension commands for this extension and their shortcut (if active). 
-	 * @param callback Called to return the registered commands. 
+	 * Returns all the registered extension commands for this extension and their shortcut (if active).
+	 * @param callback Called to return the registered commands.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of Command commands) {...}; 
+	 * function(array of Command commands) {...};
 	 */
 	export function getAll(callback: (commands: Command[]) => void): void;
 
@@ -811,15 +751,15 @@ declare module chrome.commands {
 // Content Settings
 ////////////////////
 /**
- * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally. 
- * Availability: Since Chrome 16.  
- * Permissions:  "contentSettings"   
+ * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.
+ * Availability: Since Chrome 16.
+ * Permissions:  "contentSettings"
  */
-declare module chrome.contentSettings {
+declare namespace chrome.contentSettings {
     interface ClearDetails {
 		/**
 		 * Optional.
- 		 * Where to clear the setting (default: regular). 
+ 		 * Where to clear the setting (default: regular).
 		 * The scope of the ContentSetting. One of
 		 * * regular: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),
 		 * * incognito_session_only: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings).
@@ -858,27 +798,27 @@ declare module chrome.contentSettings {
 
     interface ContentSetting {
 		/**
-		 * Clear all content setting rules set by this extension. 
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Clear all content setting rules set by this extension.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         clear(details: ClearDetails, callback?: () => void): void;
 		/**
-		 * Applies a new content setting rule. 
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Applies a new content setting rule.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         set(details: SetDetails, callback?: () => void): void;
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(array of ResourceIdentifier resourceIdentifiers) {...}; 
-		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers. 
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(array of ResourceIdentifier resourceIdentifiers) {...};
+		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers.
 		 */
         getResourceIdentifiers(callback: (resourceIdentifiers?: ResourceIdentifier[]) => void): void;
 		/**
-		 * Gets the current content setting for a given pair of URLs. 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
+		 * Gets the current content setting for a given pair of URLs.
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(object details) {...};
 		 */
         get(details: GetDetails, callback: (details: ReturnedDetails) => void): void;
     }
@@ -895,9 +835,9 @@ declare module chrome.contentSettings {
 	 * Whether to allow cookies and other local data to be set by websites. One of
 	 * allow: Accept cookies,
 	 * block: Block cookies,
-	 * session_only: Accept cookies only for the current session. 
+	 * session_only: Accept cookies only for the current session.
 	 * Default is allow.
-	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame. 
+	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.
 	 */
     var cookies: ContentSetting;
 	/**
@@ -911,9 +851,9 @@ declare module chrome.contentSettings {
 	/**
 	 * Whether to run JavaScript. One of
 	 * allow: Run JavaScript,
-	 * block: Don't run JavaScript. 
+	 * block: Don't run JavaScript.
 	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used. 
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
 	 */
     var javascript: ContentSetting;
 	/**
@@ -922,7 +862,7 @@ declare module chrome.contentSettings {
 	 * block: Don't allow sites to show desktop notifications,
 	 * ask: Ask when a site wants to show desktop notifications.
 	 * Default is ask.
-	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used. 
+	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.
 	 */
     var notifications: ContentSetting;
 	/**
@@ -937,23 +877,23 @@ declare module chrome.contentSettings {
 	/**
 	 * Whether to show images. One of
 	 * allow: Show images,
-	 * block: Don't show images. 
+	 * block: Don't show images.
 	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image. 
+	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.
 	 */
     var images: ContentSetting;
 	/**
-	 * Since Chrome 42. 
-	 * Whether to allow Geolocation. One of 
+	 * Since Chrome 42.
+	 * Whether to allow Geolocation. One of
 	 * allow: Allow sites to track your physical location,
 	 * block: Don't allow sites to track your physical location,
 	 * ask: Ask before allowing sites to track your physical location.
 	 * Default is ask.
-	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL). 
+	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
 	 */
 	var location: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to toggle the fullscreen mode. One of
 	 * allow: Allow sites to toggle the fullscreen mode,
 	 * ask: Ask when a site wants to toggle the fullscreen mode.
@@ -972,7 +912,7 @@ declare module chrome.contentSettings {
 	 */
 	var mouselock: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to run plugins unsandboxed. One of
 	 * allow: Allow sites to run plugins unsandboxed,
 	 * block: Don't allow sites to run plugins unsandboxed,
@@ -982,7 +922,7 @@ declare module chrome.contentSettings {
 	 */
 	var unsandboxedPlugins: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to download multiple files automatically. One of
 	 * allow: Allow sites to download multiple files automatically,
 	 * block: Don't allow sites to download multiple files automatically,
@@ -998,15 +938,15 @@ declare module chrome.contentSettings {
 ////////////////////
 /**
  * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
- * Availability: Since Chrome 6. 
- * Permissions:  "contextMenus" 
+ * Availability: Since Chrome 6.
+ * Permissions:  "contextMenus"
  */
-declare module chrome.contextMenus {
+declare namespace chrome.contextMenus {
     interface OnClickData {
 		/**
 		 * Optional.
  		 * Since Chrome 35.
-		 * The text for the context selection, if any. 
+		 * The text for the context selection, if any.
 		 */
         selectionText?: string;
 		/**
@@ -1033,7 +973,7 @@ declare module chrome.contextMenus {
         editable: boolean;
 		/**
 		 * Optional.
- 		 * Since Chrome 35. 
+ 		 * Since Chrome 35.
 		 * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
 		 */
         mediaType?: string;
@@ -1044,14 +984,14 @@ declare module chrome.contextMenus {
 		 */
         wasChecked?: boolean;
 		/**
-		 * Since Chrome 35. 
-		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu. 
+		 * Since Chrome 35.
+		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
 		 */
         pageUrl: string;
 		/**
 		 * Optional.
  		 * Since Chrome 35.
-		 * If the element is a link, the URL it points to. 
+		 * If the element is a link, the URL it points to.
 		 */
         linkUrl?: string;
 		/**
@@ -1062,7 +1002,7 @@ declare module chrome.contextMenus {
         parentMenuItemId?: any;
 		/**
 		 * Optional.
- 		 * Since Chrome 35. 
+ 		 * Since Chrome 35.
 		 * Will be present for elements with a 'src' URL.
 		 */
         srcUrl?: string;
@@ -1079,17 +1019,17 @@ declare module chrome.contextMenus {
         contexts?: string[];
 		/**
 		 * Optional.
- 		 * Since Chrome 20. 
-		 * Whether this context menu item is enabled or disabled. Defaults to true. 
+ 		 * Since Chrome 20.
+		 * Whether this context menu item is enabled or disabled. Defaults to true.
 		 */
         enabled?: boolean;
 		/** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
         targetUrlPatterns?: string[];
 		/**
 		 * Optional.
- 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked. 
-		 * @param info Information sent when a context menu item is clicked. 
-		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions. 
+ 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+		 * @param info Information sent when a context menu item is clicked.
+		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions.
 		 */
         onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
 		/** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
@@ -1098,7 +1038,7 @@ declare module chrome.contextMenus {
         type?: string;
 		/**
 		 * Optional.
- 		 * Since Chrome 21. 
+ 		 * Since Chrome 21.
 		 * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
 		 */
         id?: string;
@@ -1118,74 +1058,66 @@ declare module chrome.contextMenus {
         type?: string;
     }
 
-    interface MenuClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object info, tabs.Tab tab) {...}; 
-		 * Parameter info: Information sent when a context menu item is clicked. 
-		 * Parameter tab: The details of the tab where the click took place. If the click did not take place in a tab, this parameter will be missing. 
-		 */
-        addListener(callback: (info: OnClickData, tab?: chrome.tabs.Tab) => void): void;
-    }
+    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
 
 	/**
-	 * Since Chrome 38. 
-	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored. 
+	 * Since Chrome 38.
+	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
 	 */
 	var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
     /**
-	 * Removes all context menu items added by this extension. 
-	 * @param callback Called when removal is complete. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all context menu items added by this extension.
+	 * @param callback Called when removal is complete.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeAll(callback?: () => void): void;
 	/**
 	 * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function create(createProperties: CreateProperties, callback?: () => void): void;
 	/**
-	 * Updates a previously created context menu item. 
-	 * @param id The ID of the item to update. 
-	 * @param updateProperties The properties to update. Accepts the same values as the create function. 
-	 * @param callback Called when the context menu has been updated. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
 	/**
-	 * Updates a previously created context menu item. 
-	 * @param id The ID of the item to update. 
-	 * @param updateProperties The properties to update. Accepts the same values as the create function. 
-	 * @param callback Called when the context menu has been updated. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
 	/**
-	 * Removes a context menu item. 
-	 * @param menuItemId The ID of the context menu item to remove. 
-	 * @param callback Called when the context menu has been removed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function remove(menuItemId: string, callback?: () => void): void;
 	/**
-	 * Removes a context menu item. 
-	 * @param menuItemId The ID of the context menu item to remove. 
-	 * @param callback Called when the context menu has been removed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function remove(menuItemId: number, callback?: () => void): void;
 
 	/**
-	 * Since Chrome 21. 
-	 * Fired when a context menu item is clicked. 
+	 * Since Chrome 21.
+	 * Fired when a context menu item is clicked.
 	 */
     var onClicked: MenuClickedEvent;
 }
@@ -1195,10 +1127,10 @@ declare module chrome.contextMenus {
 ////////////////////
 /**
  * Use the chrome.cookies API to query and modify cookies, and to be notified when they change.
- * Availability: Since Chrome 6.  
- * Permissions:  "cookies", host permissions   
+ * Availability: Since Chrome 6.
+ * Permissions:  "cookies", host permissions
  */
-declare module chrome.cookies {
+declare namespace chrome.cookies {
 	/** Represents information about an HTTP cookie. */
     interface Cookie {
 		/** The domain of the cookie (e.g. "www.google.com", "example.com"). */
@@ -1280,57 +1212,51 @@ declare module chrome.cookies {
         cookie: Cookie;
 		/** True if a cookie was removed. */
         removed: boolean;
-		/** 
-		 * Since Chrome 12. 
-		 * The underlying reason behind the cookie's change. 
+		/**
+		 * Since Chrome 12.
+		 * The underlying reason behind the cookie's change.
 		 */
         cause: string;
     }
 
-    interface CookieChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(object changeInfo) {...};
-		 */
-        addListener(callback: (changeInfo: CookieChangeInfo) => void): void;
-    }
+    interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
 
 	/**
-	 * Lists all existing cookie stores. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of CookieStore cookieStores) {...}; 
-	 * Parameter cookieStores: All the existing cookie stores. 
+	 * Lists all existing cookie stores.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of CookieStore cookieStores) {...};
+	 * Parameter cookieStores: All the existing cookie stores.
 	 */
     export function getAllCookieStores(callback: (cookieStores: CookieStore[]) => void): void;
 	/**
-	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first. 
-	 * @param details Information to filter the cookies being retrieved. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of Cookie cookies) {...}; 
-	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info. 
+	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first.
+	 * @param details Information to filter the cookies being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of Cookie cookies) {...};
+	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info.
 	 */
     export function getAll(details: GetAllDetails, callback: (cookies: Cookie[]) => void): void;
 	/**
-	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist. 
-	 * @param details Details about the cookie being set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( Cookie cookie) {...}; 
-	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set. 
+	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
+	 * @param details Details about the cookie being set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
 	 */
     export function set(details: SetDetails, callback?: (cookie?: Cookie) => void): void;
 	/**
-	 * Deletes a cookie by name. 
-	 * @param details Information to identify the cookie to remove. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Deletes a cookie by name.
+	 * @param details Information to identify the cookie to remove.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function remove(details: Details, callback?: (details: Details) => void): void;
 	/**
 	 * Retrieves information about a single cookie. If more than one cookie of the same name exists for the given URL, the one with the longest path will be returned. For cookies with the same path length, the cookie with the earliest creation time will be returned.
-	 * @param details Details to identify the cookie being retrieved. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( Cookie cookie) {...}; 
-	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found. 
+	 * @param details Details to identify the cookie being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found.
 	 */
     export function get(details: Details, callback: (cookie?: Cookie) => void): void;
 
@@ -1342,9 +1268,9 @@ declare module chrome.cookies {
 // Debugger
 ////////////////////
 /**
- * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks. 
- * Availability: Since Chrome 18. 
- * Permissions:  "debugger" 
+ * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks.
+ * Availability: Since Chrome 18.
+ * Permissions:  "debugger"
  */
 declare module "chrome.debugger" {
 	/** Debuggee identifier. Either tabId or extensionId must be specified */
@@ -1353,8 +1279,8 @@ declare module "chrome.debugger" {
 		tabId?: number;
 		/**
 		 * Optional.
- 		 * Since Chrome 27. 
-		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser. 
+ 		 * Since Chrome 27.
+		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
 		 */
 		extensionId?: string;
 		/**
@@ -1364,9 +1290,9 @@ declare module "chrome.debugger" {
 		 */
 		targetId?: string;
     }
-	
+
 	/**
-	 * Since Chrome 28. 
+	 * Since Chrome 28.
 	 * Debug target information
 	 */
 	interface TargetInfo {
@@ -1376,14 +1302,14 @@ declare module "chrome.debugger" {
 		id: string;
 		/**
 		 * Optional.
- 		 * Since Chrome 30. 
-		 * The tab id, defined if type == 'page'. 
+ 		 * Since Chrome 30.
+		 * The tab id, defined if type == 'page'.
 		 */
 		tabId?: number;
 		/**
 		 * Optional.
- 		 * Since Chrome 30. 
-		 * The extension id, defined if type = 'background_page'. 
+ 		 * Since Chrome 30.
+		 * The extension id, defined if type = 'background_page'.
 		 */
 		extensionId?: string;
 		/** True if debugger is already attached. */
@@ -1396,61 +1322,44 @@ declare module "chrome.debugger" {
 		faviconUrl?: string;
     }
 
-    interface DebuggerDetachedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( Debuggee source, DetachReason reason) {...}; 
-		 * Parameter source: The debuggee that was detached. 
-		 * Parameter reason: Since Chrome 24. Connection termination reason. 
-		 */
-        addListener(callback: (source: Debuggee, reason: string) => void): void;
-    }
+    interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
 
-    interface DebuggerEventEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( Debuggee source, string method, object params) {...}; 
-		 * Parameter source: The debuggee that generated this event. 
-		 * Parameter method: Method name. Should be one of the notifications defined by the remote debugging protocol. 
-		 * Parameter params: JSON object with the parameters. Structure of the parameters varies depending on the method name and is defined by the 'parameters' attribute of the event description in the remote debugging protocol. 
-		 */
-        addListener(callback: (source: Debuggee, method: string, params?: Object) => void): void;
-    }
+    interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
 
 	/**
-	 * Attaches debugger to the given target. 
-	 * @param target Debugging target to which you want to attach. 
+	 * Attaches debugger to the given target.
+	 * @param target Debugging target to which you want to attach.
 	 * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
-	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
 	/**
-	 * Detaches debugger from the given target. 
-	 * @param target Debugging target from which you want to detach. 
-	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Detaches debugger from the given target.
+	 * @param target Debugging target from which you want to detach.
+	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function detach(target: Debuggee, callback?: () => void): void;
 	/**
-	 * Sends given command to the debugging target. 
-	 * @param target Debugging target to which you want to send the command. 
-	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol. 
-	 * @param commandParams Since Chrome 22. 
-	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method. 
-	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Sends given command to the debugging target.
+	 * @param target Debugging target to which you want to send the command.
+	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
+	 * @param commandParams Since Chrome 22.
+	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
+	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object result) {...};
 	 */
     export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
 	/**
-	 * Since Chrome 28. 
-	 * Returns the list of available debug targets. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of TargetInfo result) {...}; 
-	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets. 
+	 * Since Chrome 28.
+	 * Returns the list of available debug targets.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of TargetInfo result) {...};
+	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
 	 */
 	export function getTargets(callback: (result: TargetInfo[]) => void): void;
 
@@ -1464,11 +1373,11 @@ declare module "chrome.debugger" {
 // Declarative Content
 ////////////////////
 /**
- * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content. 
- * Availability: Since Chrome 33.  
- * Permissions:  "declarativeContent"   
+ * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content.
+ * Availability: Since Chrome 33.
+ * Permissions:  "declarativeContent"
  */
-declare module chrome.declarativeContent {
+declare namespace chrome.declarativeContent {
 	interface PageStateUrlDetails {
 		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
 		hostContains?: string;
@@ -1509,9 +1418,9 @@ declare module chrome.declarativeContent {
 		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
 		schemes?: string[];
 		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-		port?: any[];
+		ports?: (number | number[])[];
 	}
-	
+
 	/** Matches the state of a web page by various criteria. */
 	interface PageStateMatcher {
 		/** Optional. Filters URLs for various criteria. See event filtering. All criteria are case sensitive.  */
@@ -1521,7 +1430,7 @@ declare module chrome.declarativeContent {
 		/**
 		 * Optional.
  		 * Since Chrome 45. Warning: this is the current Beta channel. More information available on the API documentation pages.
-		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission. 
+		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission.
 		 */
 		isBookmarked?: boolean;
 	}
@@ -1530,7 +1439,7 @@ declare module chrome.declarativeContent {
 ////////////////////
 // Declarative Web Request
 ////////////////////
-declare module chrome.declarativeWebRequest {
+declare namespace chrome.declarativeWebRequest {
     interface HeaderFilter {
         nameEquals?: string;
         valueContains?: any;
@@ -1631,9 +1540,7 @@ declare module chrome.declarativeWebRequest {
         filter: RequestCookie;
     }
 
-    interface RequestedEvent extends chrome.events.Event {
-        addListener(callback: Function): void;
-    }
+    interface RequestedEvent extends chrome.events.Event<Function> {}
 
     var onRequest: RequestedEvent;
 }
@@ -1642,31 +1549,31 @@ declare module chrome.declarativeWebRequest {
 // DesktopCapture
 ////////////////////
 /**
- * Desktop Capture API that can be used to capture content of screen, individual windows or tabs. 
- * Availability: Since Chrome 34. 
- * Permissions:  "desktopCapture"    
+ * Desktop Capture API that can be used to capture content of screen, individual windows or tabs.
+ * Availability: Since Chrome 34.
+ * Permissions:  "desktopCapture"
  */
-declare module chrome.desktopCapture {
+declare namespace chrome.desktopCapture {
 	/**
-	 * Shows desktop media picker UI with the specified set of sources. 
-	 * @param sources Set of sources that should be shown to the user. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string streamId) {...}; 
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used. 
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
 	 */
     export function chooseDesktopMedia(sources: string[], callback: (streamId: string) => void): number;
 	/**
-	 * Shows desktop media picker UI with the specified set of sources. 
-	 * @param sources Set of sources that should be shown to the user. 
-	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string streamId) {...}; 
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used. 
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
 	 */
     export function chooseDesktopMedia(sources: string[], targetTab: chrome.tabs.Tab, callback: (streamId: string) => void): number;
 	/**
-	 * Hides desktop media picker dialog shown by chooseDesktopMedia(). 
-	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia() 
+	 * Hides desktop media picker dialog shown by chooseDesktopMedia().
+	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia()
 	 */
     export function cancelChooseDesktopMedia(desktopMediaRequestId: number): void;
 }
@@ -1675,30 +1582,30 @@ declare module chrome.desktopCapture {
 // Dev Tools - Inspected Window
 ////////////////////
 /**
- * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page. 
- * Availability: Since Chrome 18.  
+ * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page.
+ * Availability: Since Chrome 18.
  */
-declare module chrome.devtools.inspectedWindow {
+declare namespace chrome.devtools.inspectedWindow {
 	/** A resource within the inspected page, such as a document, a script, or an image. */
     interface Resource {
 		/** The URL of the resource. */
         url: string;
-		/** 
+		/**
 		 * Gets the content of the resource.
 		 * @param callback A function that receives resource content when the request completes.
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string content, string encoding) {...}; 
-		 * Parameter content: Content of the resource (potentially encoded). 
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported. 
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the resource (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
 		 */
         getContent(callback: (content: string, encoding: string) => void): void;
 		/**
-		 * Sets the content of the resource. 
-		 * @param content New content of the resource. Only resources with the text type are currently supported. 
-		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource. 
-		 * @param callback A function called upon request completion. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function(object error) {...}; 
+		 * Sets the content of the resource.
+		 * @param content New content of the resource. Only resources with the text type are currently supported.
+		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource.
+		 * @param callback A function called upon request completion.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(object error) {...};
 		 * Optional parameter error: Set to undefined if the resource content was set successfully; describes error otherwise.
 		 */
         setContent(content: string, commit: boolean, callback?: (error: Object) => void): void;
@@ -1713,8 +1620,8 @@ declare module chrome.devtools.inspectedWindow {
         injectedScript?: boolean;
 		/**
 		 * Optional.
- 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function. 
-		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon. 
+ 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function.
+		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon.
 		 */
 		preprocessorScript?: string;
     }
@@ -1734,22 +1641,9 @@ declare module chrome.devtools.inspectedWindow {
 		value: string;
     }
 
-    interface ResourceAddedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( Resource resource) {...}; 
-		 */
-        addListener(callback: (resource: Resource) => void): void;
-    }
+    interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
 
-    interface ResourceContentCommittedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( Resource resource, string content) {...}; 
-		 * Parameter content: New content of the resource. 
-		 */
-        addListener(callback: (resource: Resource, content: string) => void): void;
-    }
+    interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
 
 	/** The ID of the tab being inspected. This ID may be used with chrome.tabs.* API. */
     var tabId: number;
@@ -1757,20 +1651,20 @@ declare module chrome.devtools.inspectedWindow {
 	/** Reloads the inspected page. */
     export function reload(reloadOptions: ReloadOptions): void;
 	/**
-	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object. 
-	 * @param expression An expression to evaluate. 
-	 * @param callback A function called when evaluation completes. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object result, object exceptionInfo) {...}; 
-	 * Parameter result: The result of evaluation. 
-	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression. 
+	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object.
+	 * @param expression An expression to evaluate.
+	 * @param callback A function called when evaluation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object result, object exceptionInfo) {...};
+	 * Parameter result: The result of evaluation.
+	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
 	 */
     export function eval(expression: string, callback?: (result: Object, exceptionInfo: EvaluationExceptionInfo) => void): void;
 	/**
-	 * Retrieves the list of resources from the inspected page. 
-	 * @param callback A function that receives the list of resources when the request completes. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of Resource resources) {...}; 
+	 * Retrieves the list of resources from the inspected page.
+	 * @param callback A function that receives the list of resources when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of Resource resources) {...};
 	 */
     export function getResources(callback: (resources: Resource[]) => void): void;
 
@@ -1784,47 +1678,33 @@ declare module chrome.devtools.inspectedWindow {
 // Dev Tools - Network
 ////////////////////
 /**
- * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel. 
- * Availability: Since Chrome 18.  
+ * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel.
+ * Availability: Since Chrome 18.
  */
-declare module chrome.devtools.network {
+declare namespace chrome.devtools.network {
 	/** Represents a network request for a document resource (script, image and so on). See HAR Specification for reference. */
     interface Request {
-		/** 
+		/**
 		 * Returns content of the response body.
 		 * @param callback A function that receives the response body when the request completes.
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string content, string encoding) {...}; 
-		 * Parameter content: Content of the response body (potentially encoded). 
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported. 
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the response body (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
 		 */
         getContent(callback: (content: string, encoding: string) => void): void;
     }
 
-    interface RequestFinishedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( Request request) {...}; 
-		 * Parameter request: Description of a network request in the form of a HAR entry. See HAR specification for details. 
-		 */
-        addListener(callback: (request: Request) => void): void;
-    }
+    interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
 
-    interface NavigatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string url) {...}; 
-		 * Parameter url: URL of the new page. 
-		 */
-        addListener(callback: (url: string) => void): void;
-    }
+    interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
 
 	/**
-	 * Returns HAR log that contains all known network requests. 
-	 * @param callback A function that receives the HAR log when the request completes. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object harLog) {...}; 
-	 * Parameter harLog: A HAR log. See HAR specification for details. 
+	 * Returns HAR log that contains all known network requests.
+	 * @param callback A function that receives the HAR log when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object harLog) {...};
+	 * Parameter harLog: A HAR log. See HAR specification for details.
 	 */
     export function getHAR(callback: (harLog: Object) => void): void;
 
@@ -1838,44 +1718,23 @@ declare module chrome.devtools.network {
 // Dev Tools - Panels
 ////////////////////
 /**
- * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars. 
- * Availability: Since Chrome 18. 
+ * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars.
+ * Availability: Since Chrome 18.
  */
-declare module chrome.devtools.panels {
-    interface PanelShownEvent extends chrome.events.Event {
-		/** 
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(global window) {...};
-		 * Parameter window: The JavaScript window object of panel's page. 
-		 */
-        addListener(callback: (window: chrome.windows.Window) => void): void;
-    }
+declare namespace chrome.devtools.panels {
+    interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
 
-    interface PanelHiddenEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-        addListener(callback: () => void): void;
-    }
+    interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
 
-    interface PanelSearchEvent extends chrome.events.Event {
-		/**
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string action, string queryString) {...}; 
-		 * Parameter action: Type of search action being performed. 
-		 * Optional parameter queryString: Query string (only for 'performSearch'). 
-		 */
-        addListener(callback: (action: string, queryString?: string) => void): void;
-    }
+    interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
 
 	/** Represents a panel created by extension. */
     interface ExtensionPanel {
 		/**
-		 * Appends a button to the status bar of the panel. 
-		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed. 
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button. 
-		 * @param disabled Whether the button is disabled. 
+		 * Appends a button to the status bar of the panel.
+		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
 		 */
         createStatusBarButton(iconPath: string, tooltipText: string, disabled: boolean): Button;
 		/** Fired when the user switches to the panel. */
@@ -1886,44 +1745,32 @@ declare module chrome.devtools.panels {
         onSearch: PanelSearchEvent;
     }
 
-    interface ButtonClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-        addListener(callback: () => void): void;
-    }
+    interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
 
 	/** A button created by the extension. */
     interface Button {
 		/**
-		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated. 
-		 * @param iconPath Path to the new icon of the button. 
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button. 
-		 * @param disabled Whether the button is disabled. 
+		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated.
+		 * @param iconPath Path to the new icon of the button.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
 		 */
         update(iconPath?: string, tooltipText?: string, disabled?: boolean): void;
 		/** Fired when the button is clicked. */
         onClicked: ButtonClickedEvent;
     }
 
-    interface SelectionChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-        addListener(callback: () => void): void;
-    }
+    interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
 
 	/** Represents the Elements panel. */
     interface ElementsPanel {
 		/**
-		 * Creates a pane within panel's sidebar. 
-		 * @param title Text that is displayed in sidebar caption. 
-		 * @param callback A callback invoked when the sidebar is created. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function( ExtensionSidebarPane result) {...}; 
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane. 
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
 		 */
         createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
 		/** Fired when an object is selected in the panel. */
@@ -1931,84 +1778,71 @@ declare module chrome.devtools.panels {
     }
 
 	/**
-	 * Since Chrome 41. 
+	 * Since Chrome 41.
 	 * Represents the Sources panel.
 	 */
 	interface SourcesPanel {
 		/**
-		 * Creates a pane within panel's sidebar. 
-		 * @param title Text that is displayed in sidebar caption. 
-		 * @param callback A callback invoked when the sidebar is created. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function( ExtensionSidebarPane result) {...}; 
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane. 
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
 		 */
         createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
 		/** Fired when an object is selected in the panel. */
         onSelectionChanged: SelectionChangedEvent;
     }
 
-    interface ExtensionSidebarPaneShownEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(global window) {...};
-		 * Parameter window: The JavaScript window object of the sidebar page, if one was set with the setPage() method. 
-		 */
-        addListener(callback: (window: chrome.windows.Window) => void): void;
-    }
+    interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
 
-    interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-        addListener(callback: () => void): void;
-    }
+    interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
 
 	/** A sidebar created by the extension. */
     interface ExtensionSidebarPane {
 		/**
-		 * Sets the height of the sidebar. 
-		 * @param height A CSS-like size specification, such as '100px' or '12ex'. 
+		 * Sets the height of the sidebar.
+		 * @param height A CSS-like size specification, such as '100px' or '12ex'.
 		 */
         setHeight(height: string): void;
 		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane. 
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch. 
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
 		 * @param rootTitle An optional title for the root of the expression tree.
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setExpression(expression: string, rootTitle?: string, callback?: () => void): void;
 		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane. 
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch. 
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setExpression(expression: string, callback?: () => void): void;
 		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane. 
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client). 
-		 * @param rootTitle An optional title for the root of the expression tree. 
-		 * @param callback A callback invoked after the sidebar is updated with the object. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param rootTitle An optional title for the root of the expression tree.
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setObject(jsonObject: string, rootTitle?: string, callback?: () => void): void;
 		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane. 
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client). 
-		 * @param callback A callback invoked after the sidebar is updated with the object. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setObject(jsonObject: string, callback?: () => void): void;
 		/**
-		 * Sets an HTML page to be displayed in the sidebar pane. 
-		 * @param path Relative path of an extension page to display within the sidebar. 
+		 * Sets an HTML page to be displayed in the sidebar pane.
+		 * @param path Relative path of an extension page to display within the sidebar.
 		 */
         setPage(path: string): void;
 		/** Fired when the sidebar pane becomes visible as a result of user switching to the panel that hosts it. */
@@ -2020,38 +1854,38 @@ declare module chrome.devtools.panels {
 	/** Elements panel. */
     var elements: ElementsPanel;
 	/**
-	 * Since Chrome 38. 
-	 * Sources panel. 
+	 * Since Chrome 38.
+	 * Sources panel.
 	 */
 	var sources: SourcesPanel;
 
 	/**
-	 * Creates an extension panel. 
-	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar. 
-	 * @param iconPath Path of the panel's icon relative to the extension directory. 
-	 * @param pagePath Path of the panel's HTML page relative to the extension directory. 
-	 * @param callback A function that is called when the panel is created. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionPanel panel) {...}; 
-	 * Parameter panel: An ExtensionPanel object representing the created panel. 
+	 * Creates an extension panel.
+	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar.
+	 * @param iconPath Path of the panel's icon relative to the extension directory.
+	 * @param pagePath Path of the panel's HTML page relative to the extension directory.
+	 * @param callback A function that is called when the panel is created.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionPanel panel) {...};
+	 * Parameter panel: An ExtensionPanel object representing the created panel.
 	 */
     export function create(title: string, iconPath: string, pagePath: string, callback?: (panel: ExtensionPanel) => void): void;
 	/**
-	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter. 
-	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( devtools.inspectedWindow.Resource resource) {...}; 
-	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked. 
+	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter.
+	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( devtools.inspectedWindow.Resource resource) {...};
+	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked.
 	 */
     export function setOpenResourceHandler(callback?: (resource: chrome.devtools.inspectedWindow.Resource) => void): void;
 	/**
-	 * Since Chrome 38. 
-	 * Requests DevTools to open a URL in a Developer Tools panel. 
-	 * @param url The URL of the resource to open. 
-	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded. 
-	 * @param callback A function that is called when the resource has been successfully loaded. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Since Chrome 38.
+	 * Requests DevTools to open a URL in a Developer Tools panel.
+	 * @param url The URL of the resource to open.
+	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded.
+	 * @param callback A function that is called when the resource has been successfully loaded.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function openResource(url: string, lineNumber: number, callback: () => void): void;
 }
@@ -2060,12 +1894,12 @@ declare module chrome.devtools.panels {
 // Document Scan
 ////////////////////
 /**
- * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners. 
- * Availability: Since Chrome 44.  
- * Permissions:  "documentScan"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+ * Availability: Since Chrome 44.
+ * Permissions:  "documentScan"
+ * Important: This API works only on Chrome OS.
  */
-declare module chrome.documentScan {
+declare namespace chrome.documentScan {
 	interface DocumentScanOptions {
 		/** Optional. The MIME types that are accepted by the caller.  */
 		mimeTypes?: string[];
@@ -2079,13 +1913,13 @@ declare module chrome.documentScan {
 		/** The MIME type of dataUrls. */
 		mimeType: string;
 	}
-	
+
 	/**
-	 * Performs a document scan. On success, the PNG data will be sent to the callback. 
-	 * @param options Object containing scan parameters. 
-	 * @param callback Called with the result and data from the scan. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Performs a document scan. On success, the PNG data will be sent to the callback.
+	 * @param options Object containing scan parameters.
+	 * @param callback Called with the result and data from the scan.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
 }
@@ -2095,10 +1929,10 @@ declare module chrome.documentScan {
 ////////////////////
 /**
  * Use the chrome.downloads API to programmatically initiate, monitor, manipulate, and search for downloads.
- * Availability: Since Chrome 31. 
- * Permissions:  "downloads" 
+ * Availability: Since Chrome 31.
+ * Permissions:  "downloads"
  */
-declare module chrome.downloads {
+declare namespace chrome.downloads {
     interface HeaderNameValuePair {
 		/** Name of the HTTP header. */
         name: string;
@@ -2214,7 +2048,7 @@ declare module chrome.downloads {
     }
 
     interface GetFileIconOptions {
-		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size. 
+		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size.
  */
         size?: number;
     }
@@ -2279,102 +2113,76 @@ declare module chrome.downloads {
 		conflictAction?: string;
 	}
 
-    interface DownloadChangedEvent extends chrome.events.Event {
-		/**
-		 * When any of a DownloadItem's properties except bytesReceived and estimatedEndTime changes, this event fires with the downloadId and an object containing the properties that changed. 
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(object downloadDelta) {...}; 
-		 */
-        addListener(callback: (downloadDelta: DownloadDelta) => void): void;
-    }
+    interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
 
-    interface DownloadCreatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( DownloadItem downloadItem) {...}; 
-		 */
-        addListener(callback: (downloadItem: DownloadItem) => void): void;
-    }
+    interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
 
-    interface DownloadErasedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(integer downloadId) {...}; 
-		 * Parameter downloadId: The id of the DownloadItem that was erased. 
-		 */
-        addListener(callback: (downloadId: number) => void): void;
-    }
+    interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
 
-	interface DownloadDeterminingFilenameEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( DownloadItem downloadItem, function suggest) {...};
-		 */
-		addListener(callback: (downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void): void;
-	}
+	interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
 
 	/**
-	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of DownloadItem results) {...}; 
+	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of DownloadItem results) {...};
 	 */
     export function search(query: DownloadQuery, callback: (results: DownloadItem[]) => void): void;
 	/**
-	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active. 
-	 * @param downloadId The id of the download to pause. 
-	 * @param callback Called when the pause request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
+	 * @param downloadId The id of the download to pause.
+	 * @param callback Called when the pause request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function pause(downloadId: number, callback?: () => void): void;
 	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message. 
-	 * @param downloadId The identifier for the download. 
-	 * @param callback A URL to an image that represents the download. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(string iconURL) {...}; 
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
 	 */
     export function getFileIcon(downloadId: number, callback: (iconURL: string) => void): void;
 	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message. 
-	 * @param downloadId The identifier for the download. 
-	 * @param callback A URL to an image that represents the download. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(string iconURL) {...}; 
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
 	 */
     export function getFileIcon(downloadId: number, options: GetFileIconOptions, callback: (iconURL: string) => void): void;
 	/**
-	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active. 
+	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
 	 * @param downloadId The id of the download to resume.
-	 * @param callback  Called when the resume request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback  Called when the resume request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function resume(downloadId: number, callback?: () => void): void;
 	/**
-	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore. 
-	 * @param downloadId The id of the download to cancel. 
-	 * @param callback Called when the cancel request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore.
+	 * @param downloadId The id of the download to cancel.
+	 * @param callback Called when the cancel request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function cancel(downloadId: number, callback?: () => void): void;
 	/**
-	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it. 
-	 * @param options What to download and how. 
-	 * @param callback Called with the id of the new DownloadItem. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(integer downloadId) {...}; 
+	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it.
+	 * @param options What to download and how.
+	 * @param callback Called with the id of the new DownloadItem.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(integer downloadId) {...};
 	 */
     export function download(options: DownloadOptions, callback?: (downloadId: number) => void): void;
 	/**
-	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time. 
-	 * @param downloadId The identifier for the downloaded file. 
+	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time.
+	 * @param downloadId The identifier for the downloaded file.
 	 */
     export function open(downloadId: number): void;
 	/**
-	 * Show the downloaded file in its folder in a file manager. 
-	 * @param downloadId The identifier for the downloaded file. 
+	 * Show the downloaded file in its folder in a file manager.
+	 * @param downloadId The identifier for the downloaded file.
 	 */
     export function show(downloadId: number): void;
 	/** Show the default Downloads folder in a file manager. */
@@ -2382,21 +2190,21 @@ declare module chrome.downloads {
 	/**
 	 * Erase matching DownloadItem from history without deleting the downloaded file. An onErased event will fire for each DownloadItem that matches query, then callback will be called.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of integer erasedIds) {...}; 
+	 * function(array of integer erasedIds) {...};
 	 */
     export function erase(query: DownloadQuery, callback: (erasedIds: number[]) => void): void;
 	/**
-	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFile(downloadId: number, callback?: () => void): void;
 	/**
 	 * Prompt the user to accept a dangerous download. Can only be called from a visible context (tab, window, or page/browser action popup). Does not automatically accept dangerous downloads. If the download is accepted, then an onChanged event will fire, otherwise nothing will happen. When all the data is fetched into a temporary file and either the download is not dangerous or the danger has been accepted, then the temporary file is renamed to the target filename, the |state| changes to 'complete', and onChanged fires.
 	 * @param downloadId The identifier for the DownloadItem.
-	 * @param callback Called when the danger prompt dialog closes. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called when the danger prompt dialog closes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function acceptDanger(downloadId: number, callback: () => void): void;
 	/** Initiate dragging the downloaded file to another application. Call in a javascript ondragstart handler. */
@@ -2418,60 +2226,60 @@ declare module chrome.downloads {
 // Enterprise Platform Keys
 ////////////////////
 /**
- * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys. 
- * Availability: Since Chrome 37.  
- * Permissions:  "enterprise.platformKeys"   
- * Important: This API works only on Chrome OS. 
- * Note:  This API is only for extensions pre-installed by policy. 
+ * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys.
+ * Availability: Since Chrome 37.
+ * Permissions:  "enterprise.platformKeys"
+ * Important: This API works only on Chrome OS.
+ * Note:  This API is only for extensions pre-installed by policy.
  */
-declare module chrome.enterprise.platformKeys {
+declare namespace chrome.enterprise.platformKeys {
 	interface Token {
 		/**
-		 * Uniquely identifies this Token. 
+		 * Uniquely identifies this Token.
 		 * Static IDs are "user" and "system", referring to the platform's user-specific and the system-wide hardware token, respectively. Any other tokens (with other identifiers) might be returned by enterprise.platformKeys.getTokens.
 		 */
 		id: string;
 		/**
-		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed. 
+		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed.
 		 * Only non-extractable RSASSA-PKCS1-V1_5 keys with modulusLength up to 2048 can be generated. Each key can be used for signing data at most once.
 		 * Keys generated on a specific Token cannot be used with any other Tokens, nor can they be used with window.crypto.subtle. Equally, Key objects created with window.crypto.subtle cannot be used with this interface.
 		 */
 		subtleCrypto: SubtleCrypto;
 	}
-	
+
 	/**
-	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook). 
-	 * @param callback Invoked by getTokens with the list of available Tokens. 
+	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook).
+	 * @param callback Invoked by getTokens with the list of available Tokens.
 	 * The callback parameter should be a function that looks like this:
 	 * function(array of Token tokens) {...};
-	 * Parameter tokens: The list of available tokens. 
+	 * Parameter tokens: The list of available tokens.
 	 */
 	export function getToken(callback: (tokens: Token[]) => void): void;
 	/**
-	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param callback Called back with the list of the available certificates. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of ArrayBuffer certificates) {...}; 
-	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate. 
+	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param callback Called back with the list of the available certificates.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of ArrayBuffer certificates) {...};
+	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate.
 	 */
 	export function getCertificates(tokenId: string, callback: (certificates: ArrayBuffer) => void): void;
 	/**
-	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param certificate The DER encoding of a X.509 certificate. 
-	 * @param callback Called back when this operation is finished. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function importCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
 	/**
-	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param certificate The DER encoding of a X.509 certificate. 
-	 * @param callback Called back when this operation is finished. 
+	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
 }
@@ -2480,18 +2288,18 @@ declare module chrome.enterprise.platformKeys {
 // Events
 ////////////////////
 /**
- * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens. 
- * Availability: Since Chrome 21.  
+ * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * Availability: Since Chrome 21.
  */
-declare module chrome.events {
+declare namespace chrome.events {
 	/** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
     interface UrlFilter {
 		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
         schemes?: string[];
 		/**
 		 * Optional.
- 		 * Since Chrome 23. 
-		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax. 
+ 		 * Since Chrome 23.
+		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
 		 */
         urlMatches?: string;
 		/** Optional. Matches if the path segment of the URL contains a specified string.  */
@@ -2530,73 +2338,73 @@ declare module chrome.events {
         ports?: any[];
 		/**
 		 * Optional.
- 		 * Since Chrome 28. 
-		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax. 
+ 		 * Since Chrome 28.
+		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
 		 */
 		originAndPathMatches?: string;
     }
 
 	/** An object which allows the addition and removal of listeners for a Chrome event. */
-    interface Event {
+    interface Event<T extends Function> {
 		/**
-		 * Registers an event listener callback to an event. 
-		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event. 
+		 * Registers an event listener callback to an event.
+		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
 		 * The callback parameter should be a function that looks like this:
-		 * function() {...}; 
+		 * function() {...};
 		 */
-        addListener(callback: Function): void;
+        addListener(callback: T): void;
 		/**
-		 * Returns currently registered rules. 
-		 * @param callback Called with registered rules. 
+		 * Returns currently registered rules.
+		 * @param callback Called with registered rules.
 		 * The callback parameter should be a function that looks like this:
 		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         getRules(callback: (rules: Rule[]) => void): void;
 		/**
-		 * Returns currently registered rules. 
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned. 
-		 * @param callback Called with registered rules. 
+		 * Returns currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+		 * @param callback Called with registered rules.
 		 * The callback parameter should be a function that looks like this:
 		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
         /**
-		 * @param callback Listener whose registration status shall be tested. 
+		 * @param callback Listener whose registration status shall be tested.
 		 */
-        hasListener(callback: Function): boolean;
+        hasListener(callback: T): boolean;
 		/**
-		 * Unregisters currently registered rules. 
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered. 
-		 * @param callback Called when rules were unregistered. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Unregisters currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
 		/**
-		 * Unregisters currently registered rules. 
-		 * @param callback Called when rules were unregistered. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Unregisters currently registered rules.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         removeRules(callback?: () => void): void;
 		/**
-		 * Registers rules to handle events. 
-		 * @param rules Rules to be registered. These do not replace previously registered rules. 
-		 * @param callback Called with registered rules. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function(array of Rule rules) {...}; 
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Registers rules to handle events.
+		 * @param rules Rules to be registered. These do not replace previously registered rules.
+		 * @param callback Called with registered rules.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(array of Rule rules) {...};
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
 		/**
-		 * Deregisters an event listener callback from an event. 
-		 * @param callback Listener that shall be unregistered. 
+		 * Deregisters an event listener callback from an event.
+		 * @param callback Listener that shall be unregistered.
 		 * The callback parameter should be a function that looks like this:
-		 * function() {...}; 
+		 * function() {...};
 		 */
-        removeListener(callback: () => void): void;
+        removeListener(callback: T): void;
         hasListeners(): boolean;
     }
 
@@ -2612,8 +2420,8 @@ declare module chrome.events {
         actions: any[];
 		/**
 		 * Optional.
- 		 * Since Chrome 28. 
-		 * Tags can be used to annotate rules and perform operations on sets of rules. 
+ 		 * Since Chrome 28.
+		 * Tags can be used to annotate rules and perform operations on sets of rules.
 		 */
 		tags?: string[];
     }
@@ -2623,10 +2431,10 @@ declare module chrome.events {
 // Extension
 ////////////////////
 /**
- * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing. 
- * Availability: Since Chrome 5.  
+ * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing.
+ * Availability: Since Chrome 5.
  */
-declare module chrome.extension {
+declare namespace chrome.extension {
     interface FetchProperties {
 		/** Optional. The window to restrict the search to. If omitted, returns all views.  */
         windowId?: number;
@@ -2639,25 +2447,11 @@ declare module chrome.extension {
         message: string;
     }
 
-	interface OnRequestEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(any request, runtime.MessageSender sender, function sendResponse) {...}; 
-		 * Parameter request: The request sent by the calling script. 
-		 * Parameter sendResponse: Function to call (at most once) when you have a response. The argument should be any JSON-ifiable object, or undefined if there is no response. If you have more than one onRequest listener in the same document, then only one may send a response. 
-		 */
-		addListener(callback: (request: any, sender: runtime.MessageSender, sendResponse: () => void) => void): void;
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(runtime.MessageSender sender, function sendResponse) {...}; 
-		 * Parameter sendResponse: Function to call (at most once) when you have a response. The argument should be any JSON-ifiable object, or undefined if there is no response. If you have more than one onRequest listener in the same document, then only one may send a response. 
-		 */
-		addListener(callback: (sender: runtime.MessageSender, sendResponse: () => void) => void): void;
-    }
+	interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
 
 	/**
-	 * Since Chrome 7. 
-	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior. 
+	 * Since Chrome 7.
+	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior.
 	 */
     var inIncognitoContext: boolean;
 	/** Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has occured lastError will be undefined. */
@@ -2665,65 +2459,65 @@ declare module chrome.extension {
 
 	/** Returns the JavaScript 'window' object for the background page running inside the current extension. Returns null if the extension has no background page. */
     export function getBackgroundPage(): Window;
-	/** 
+	/**
 	 * Converts a relative path within an extension install directory to a fully-qualified URL.
-	 * @param path A path to a resource within an extension expressed relative to its install directory. 
+	 * @param path A path to a resource within an extension expressed relative to its install directory.
 	 */
     export function getURL(path: string): string;
 	/**
-	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery. 
-	 * Since Chrome 9. 
+	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery.
+	 * Since Chrome 9.
 	 */
     export function setUpdateUrlData(data: string): void;
 	/** Returns an array of the JavaScript 'window' objects for each of the pages running inside the current extension. */
     export function getViews(fetchProperties?: FetchProperties): Window[];
 	/**
-	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox. 
-	 * Since Chrome 12. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise. 
+	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise.
 	 */
     export function isAllowedFileSchemeAccess(callback: (isAllowedAccess: boolean) => void): void;
 	/**
-	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox. 
-	 * Since Chrome 12. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise. 
+	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise.
 	 */
     export function isAllowedIncognitoAccess(callback: (isAllowedAccess: boolean) => void): void;
 	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension. 
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
 	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension. 
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this: 
+	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension.
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
 	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendRequest(extensionId: string, request: any, responseCallback?: (response: any) => void): void;
 	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension. 
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
 	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this: 
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
 	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendRequest(request: any, responseCallback?: (response: any) => void): void;
 	/**
-	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window. 
-	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}. 
+	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window.
+	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}.
 	 */
 	export function getExtensionTabs(windowId?: number): Window[];
-	
+
 	/**
-	 * Fired when a request is sent from either an extension process or a content script. 
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage. 
+	 * Fired when a request is sent from either an extension process or a content script.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage.
 	 */
 	var onRequest: OnRequestEvent;
 	/**
-	 * Fired when a request is sent from another extension. 
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal. 
+	 * Fired when a request is sent from another extension.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal.
 	 */
 	var onRequestExternal: OnRequestEvent;
 }
@@ -2732,17 +2526,17 @@ declare module chrome.extension {
 // File Browser Handler
 ////////////////////
 /**
- * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website. 
- * Availability: Since Chrome 12.  
- * Permissions:  "fileBrowserHandler"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website.
+ * Availability: Since Chrome 12.
+ * Permissions:  "fileBrowserHandler"
+ * Important: This API works only on Chrome OS.
  */
-declare module chrome.fileBrowserHandler {
+declare namespace chrome.fileBrowserHandler {
     interface SelectionParams {
 		/**
 		 * Optional.
- 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png'] 
-		 * Since Chrome 23. 
+ 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png']
+		 * Since Chrome 23.
 		 */
         allowedFileExtensions?: string[];
 		/** Suggested name for the file. */
@@ -2764,27 +2558,19 @@ declare module chrome.fileBrowserHandler {
         entries: any[];
     }
 
-    interface FileBrowserHandlerExecuteEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id, FileHandlerExecuteEventDetails details) {...}; 
-		 * Parameter id: File browser action id as specified in the listener component's manifest. 
-		 * Parameter details: File handler execute event details. 
-		 */
-        addListener(callback: (id: string, details: FileHandlerExecuteEventDetails) => void): void;
-    }
+    interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
 
 	/**
-	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture. 
-	 * Since Chrome 21. 
-	 * @param selectionParams Parameters that will be used while selecting the file. 
-	 * @param callback Function called upon completion. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
-	 * Parameter result: Result of the method. 
+	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
+	 * Since Chrome 21.
+	 * @param selectionParams Parameters that will be used while selecting the file.
+	 * @param callback Function called upon completion.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 * Parameter result: Result of the method.
 	 */
 	export function selectFile(selectionParams: SelectionParams, callback: (result: SelectionResult) => void): void;
-	
+
 	/** Fired when file system action is executed from ChromeOS file browser. */
     var onExecute: FileBrowserHandlerExecuteEvent;
 }
@@ -2793,12 +2579,12 @@ declare module chrome.fileBrowserHandler {
 // File System Provider
 ////////////////////
 /**
- * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS. 
- * Availability: Since Chrome 40.  
- * Permissions:  "fileSystemProvider"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+ * Availability: Since Chrome 40.
+ * Permissions:  "fileSystemProvider"
+ * Important: This API works only on Chrome OS.
  */
-declare module chrome.fileSystemProvider {
+declare namespace chrome.fileSystemProvider {
 	interface OpenedFileInfo {
 		/** A request ID to be be used by consecutive read/write and close requests. */
 		openRequestId: number;
@@ -2839,29 +2625,29 @@ declare module chrome.fileSystemProvider {
 		displayName: string;
 		/** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
 		writable: boolean;
-		/** 
-		 * The maximum number of files that can be opened at once. If 0, then not limited. 
+		/**
+		 * The maximum number of files that can be opened at once. If 0, then not limited.
 		 * @since Since Chrome 42.
 		 */
 		openedFilesLimit: number;
 		/**
-		 * List of currently opened files. 
+		 * List of currently opened files.
 		 * @since Since Chrome 42.
 		 */
 		openedFiles: OpenedFileInfo[];
 		/**
 		 * Optional.
- 		 * Whether the file system supports the tag field for observing directories. 
-		 * @since Since Chrome 45. Warning: this is the current Beta channel. 
+ 		 * Whether the file system supports the tag field for observing directories.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		supportsNotifyTag?: boolean;
 		/**
-		 * List of watchers. 
-		 * @since Since Chrome 45. Warning: this is the current Beta channel.  
+		 * List of watchers.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		watchers: FileWatchersInfo[];
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface GetActionsRequestedOptions {
 		/** The identifier of the file system related to this operation. */
@@ -2871,7 +2657,7 @@ declare module chrome.fileSystemProvider {
 		/** The path of the entry to return the list of actions for. */
 		entryPath: string;
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface Action {
 		/** The identifier of the action. Any string or CommonActionId for common actions. */
@@ -2879,7 +2665,7 @@ declare module chrome.fileSystemProvider {
 		/** Optional. The title of the action. It may be ignored for common actions.  */
 		title?: string;
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface ExecuteActionRequestedOptions {
 		/** The identifier of the file system related to this operation. */
@@ -2901,13 +2687,13 @@ declare module chrome.fileSystemProvider {
 		writable?: boolean;
 		/**
 		 * Optional.
- 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited. 
+ 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
 		 * @since Since Chrome 41.
 		 */
 		openedFilesLimit?: number;
 		/**
 		 * Optional.
- 		 * Whether the file system supports the tag field for observed directories. 
+ 		 * Whether the file system supports the tag field for observed directories.
 		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		supportsNotifyTag?: boolean;
@@ -3018,148 +2804,64 @@ declare module chrome.fileSystemProvider {
 		operationRequestId: number;
 	}
 
-	interface RequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface MetadataRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void): void;
-	}
+	interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
 
-	interface DirectoryPathRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void): void;
-	}
+	interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
 
-	interface OpenFileRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface OpenedFileRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface OpenedFileOffsetRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void): void;
-	}
+	interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
 
-	interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface EntryPathRecursiveRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface FilePathRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface SourceTargetPathRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface FilePathLengthRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface OpenedFileIoRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface OperationRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object options, function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
+	interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
-	interface OptionlessRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(function successCallback, function errorCallback) {...}; 
-		 */
-		addListener(callback: (successCallback: Function, errorCallback: (error: string) => void) => void): void;
-	}
-	
 	/**
 	 * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
 	 * Depending on the type of the file system being mounted, the source option must be set appropriately.
 	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function mount(options: MountOptions, callback?: () => void): void;
 	/**
 	 * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
 	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function unmount(options: UnmountOptions, callback?: () => void): void;
 	/**
-	 * Returns all file systems mounted by the extension. 
-	 * @param callback Callback to receive the result of getAll function. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of FileSystemInfo fileSystems) {...}; 
+	 * Returns all file systems mounted by the extension.
+	 * @param callback Callback to receive the result of getAll function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of FileSystemInfo fileSystems) {...};
 	 */
 	export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
 	/**
-	 * Returns information about a file system with the passed fileSystemId. 
-	 * @since Since Chrome 42. 
-	 * @param callback Callback to receive the result of get function. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(FileSystemInfo fileSystem) {...}; 
+	 * Returns information about a file system with the passed fileSystemId.
+	 * @since Since Chrome 42.
+	 * @param callback Callback to receive the result of get function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(FileSystemInfo fileSystem) {...};
 	 */
 	export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
 	/**
@@ -3169,12 +2871,12 @@ declare module chrome.fileSystemProvider {
 	 * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
 	 * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
 	 * In case of an error, runtime.lastError will be set will a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
+	 * @param callback A generic result callback to indicate success or failure.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function notify(options: NotificationOptions, callback: () => void): void;
-	
+
 	/** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
 	var onUnmountRequested: RequestedEvent;
 	/** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
@@ -3204,23 +2906,23 @@ declare module chrome.fileSystemProvider {
 	/** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
 	var onAbortRequested: OperationRequestedEvent;
 	/**
-	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true. 
-	 * @since Since Chrome 44. 
+	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+	 * @since Since Chrome 44.
 	 */
 	var onConfigureRequested: RequestedEvent;
 	/**
-	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true. 
-	 * @since Since Chrome 44. 
+	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+	 * @since Since Chrome 44.
 	 */
 	var onMountRequested: OptionlessRequestedEvent;
 	/**
-	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called. 
+	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
 	 * @since Since Chrome 45. Warning: this is the current Beta channel.
 	 */
 	var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
 	/**
-	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called. 
-	 * @since Since Chrome 45. Warning: this is the current Beta channel. 
+	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+	 * @since Since Chrome 45. Warning: this is the current Beta channel.
 	 */
 	var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
 }
@@ -3229,11 +2931,11 @@ declare module chrome.fileSystemProvider {
 // Font Settings
 ////////////////////
 /**
- * Use the chrome.fontSettings API to manage Chrome's font settings. 
- * Availability: Since Chrome 22.  
- * Permissions:  "fontSettings"   
+ * Use the chrome.fontSettings API to manage Chrome's font settings.
+ * Availability: Since Chrome 22.
+ * Permissions:  "fontSettings"
  */
-declare module chrome.fontSettings {
+declare namespace chrome.fontSettings {
 	/** Represents a font name. */
     interface FontName {
 		/** The display name of the font. */
@@ -3289,120 +2991,96 @@ declare module chrome.fontSettings {
         fontId: string;
     }
 
-    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
-		 */
-        addListener(callback: (details: FontSizeDetails) => void): void;
-    }
+    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface DefaultFontSizeChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
-		 */
-        addListener(callback: (details: FontSizeDetails) => void): void;
-    }
+    interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface MinimumFontSizeChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
-		 */
-        addListener(callback: (details: FontSizeDetails) => void): void;
-    }
+    interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
 
-    interface FontChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
-		 */
-        addListener(callback: (details: FullFontDetails) => void): void;
-    }
+    interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
 
 	/**
-	 * Sets the default font size. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the default font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
 	/**
-	 * Gets the font for a given script and generic font family. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
 	/**
-	 * Gets the default font size. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the default font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
 	export function getDefaultFontSize(details?: Object, callback?: (options: FontSizeDetails) => void): void;
 	/**
-	 * Gets the minimum font size. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the minimum font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
 	/**
-	 * Sets the minimum font size. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the minimum font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
-	 * Gets the default size for fixed width fonts. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the default size for fixed width fonts.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
 	/**
-	 * Clears the default font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the default font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearDefaultFontSize(details?: Object, callback?: Function): void;
 	/**
-	 * Sets the default size for fixed width fonts. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the default size for fixed width fonts.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
-	 * Clears the font set by this extension, if any. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the font set by this extension, if any.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearFont(details: FontDetails, callback?: Function): void;
 	/**
-	 * Sets the font for a given script and generic font family. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Sets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function setFont(details: SetFontDetails, callback?: Function): void;
 	/**
-	 * Clears the minimum font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the minimum font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearMinimumFontSize(details?: Object, callback?: Function): void;
 	/**
-	 * Gets a list of fonts on the system. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of FontName results) {...}; 
+	 * Gets a list of fonts on the system.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of FontName results) {...};
 	 */
     export function getFontList(callback: (results: FontName[]) => void): void;
 	/**
-	 * Clears the default fixed font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the default fixed font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
 
@@ -3420,11 +3098,11 @@ declare module chrome.fontSettings {
 // Google Cloud Messaging
 ////////////////////
 /**
- * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service. 
- * Availability: Since Chrome 35.  
- * Permissions:  "gcm"   
+ * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+ * Availability: Since Chrome 35.
+ * Permissions:  "gcm"
  */
-declare module chrome.gcm {
+declare namespace chrome.gcm {
 	interface OutgoingMessage {
 		/** The ID of the server to send the message to as assigned by Google API Console. */
 		destinationId: string;
@@ -3441,13 +3119,13 @@ declare module chrome.gcm {
 		data: Object;
 		/**
 		 * Optional.
-		 * The sender who issued the message. 
-		 * @since Since Chrome 41. 
+		 * The sender who issued the message.
+		 * @since Since Chrome 41.
 		 */
 		from?: string;
 		/**
 		 * Optional.
-		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details. 
+		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
 		 */
 		collapseKey?: string;
 	}
@@ -3461,61 +3139,41 @@ declare module chrome.gcm {
 		detail: Object;
 	}
 
-	interface MessageReceptionEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object message) {...}; 
-		 * Parameter message: A message received from another party via GCM. 
-		 */
-		addListener(callback: (message: IncomingMessage) => void): void;
-	}
+	interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
 
-	interface MessageDeletionEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-	}
+	interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
+
+	interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
 
-	interface GcmErrorEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object error) {...}; 
-		 * Parameter error: An error that occured while trying to send the message either in Chrome or on the GCM server. Application can retry sending the message with a reasonable backoff and possibly longer time-to-live. 
-		 */
-		addListener(callback: (error: GcmError) => void): void;
-	}
-	
 	/** The maximum size (in bytes) of all key/value pairs in a message. */
 	var MAX_MESSAGE_SIZE: number;
-	
+
 	/**
-	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned. 
-	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs. 
-	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty. 
-	 * The callback parameter should be a function that looks like this: 
+	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+	 * The callback parameter should be a function that looks like this:
 	 * function(string registrationId) {...};
-	 * Parameter registrationId: A registration ID assigned to the application by the GCM. 
+	 * Parameter registrationId: A registration ID assigned to the application by the GCM.
 	 */
 	export function register(senderIds: string[], callback: (registrationId: string) => void): void;
 	/**
-	 * Unregisters the application from GCM. 
-	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set. 
+	 * Unregisters the application from GCM.
+	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
 	 * The callback parameter should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function unregister(callback: () => void): void;
 	/**
-	 * Sends a message according to its contents. 
-	 * @param message A message to send to the other party via GCM. 
-	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems. 
+	 * Sends a message according to its contents.
+	 * @param message A message to send to the other party via GCM.
+	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
 	 * The callback parameter should be a function that looks like this:
 	 * function(string messageId) {...};
-	 * Parameter messageId: The ID of the message that the callback was issued for. 
+	 * Parameter messageId: The ID of the message that the callback was issued for.
 	 */
 	export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
-	
+
 	/** Fired when a message is received through GCM. */
 	var onMessage: MessageReceptionEvent;
 	/** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
@@ -3528,11 +3186,11 @@ declare module chrome.gcm {
 // History
 ////////////////////
 /**
- * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages. 
- * Availability: Since Chrome 5.  
- * Permissions:  "history"   
+ * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages.
+ * Availability: Since Chrome 5.
+ * Permissions:  "history"
  */
-declare module chrome.history {
+declare namespace chrome.history {
 	/** An object encapsulating one visit to a URL. */
     interface VisitItem {
 		/** The transition type for this visit from its referrer. */
@@ -3593,56 +3251,44 @@ declare module chrome.history {
         urls?: string[];
     }
 
-    interface HistoryVisitedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( HistoryItem result) {...}; 
-		 */
-        addListener(callback: (result: HistoryItem) => void): void;
-    }
+    interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
 
-    interface HistoryVisitRemovedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object removed) {...}; 
-		 */
-        addListener(callback: (removed: RemovedResult) => void): void;
-    }
+    interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
 
 	/**
-	 * Searches the history for the last visit time of each page matching the query. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of HistoryItem results) {...}; 
+	 * Searches the history for the last visit time of each page matching the query.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of HistoryItem results) {...};
 	 */
     export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
 	/**
-	 * Adds a URL to the history at the current time with a transition type of "link". 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Adds a URL to the history at the current time with a transition type of "link".
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function addUrl(details: Url, callback?: () => void): void;
 	/**
-	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteRange(range: Range, callback: () => void): void;
 	/**
-	 * Deletes all items from the history. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function() {...}; 
+	 * Deletes all items from the history.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteAll(callback: () => void): void;
 	/**
-	 * Retrieves information about visits to a URL. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of VisitItem results) {...}; 
+	 * Retrieves information about visits to a URL.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of VisitItem results) {...};
 	 */
     export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
 	/**
-	 * Removes all occurrences of the given URL from the history. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all occurrences of the given URL from the history.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteUrl(details: Url, callback?: () => void): void;
 
@@ -3656,26 +3302,26 @@ declare module chrome.history {
 // i18n
 ////////////////////
 /**
- * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension. 
- * @since Chrome 5. 
+ * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+ * @since Chrome 5.
  */
-declare module chrome.i18n {
+declare namespace chrome.i18n {
 	/**
-	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(array of string languages) {...};
-	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN 
+	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
 	 */
 	export function getAcceptLanguages(callback: (languages: string[]) => void): void;
 	/**
-	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined. 
+	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
 	 * @param messageName The name of the message, as specified in the messages.json file.
-	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any. 
+	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
 	 */
 	export function getMessage(messageName: string, substitutions?: any): string;
 	/**
-	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages. 
-	 * @since Chrome 35. 
+	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+	 * @since Chrome 35.
 	 */
 	export function getUILanguage(): string;
 }
@@ -3684,11 +3330,11 @@ declare module chrome.i18n {
 // Identity
 ////////////////////
 /**
- * Use the chrome.identity API to get OAuth2 access tokens. 
- * Permissions:  "identity"   
- * @since Chrome 29. 
+ * Use the chrome.identity API to get OAuth2 access tokens.
+ * Permissions:  "identity"
+ * @since Chrome 29.
  */
-declare module chrome.identity {
+declare namespace chrome.identity {
 	/** @since Chrome 32. */
 	interface AccountInfo {
 		/** A unique identifier for the account. This ID will not change for the lifetime of the account. */
@@ -3697,8 +3343,8 @@ declare module chrome.identity {
 
 	interface TokenDetails {
 		/**
-		 * Optional. 
-		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required. 
+		 * Optional.
+		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
 		 */
 		interactive?: boolean;
 		/**
@@ -3741,13 +3387,7 @@ declare module chrome.identity {
 		interactive?: boolean;
 	}
 
-	interface SignInChangeEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( AccountInfo account, boolean signedIn) {...}; 
-		 */
-		addListener(callback: (account: AccountInfo, signedIn: boolean) => void): void;
-	}
+	interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
 
 	/**
 	 * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
@@ -3759,10 +3399,10 @@ declare module chrome.identity {
 	 * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
 	 * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
 	 * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-	 * @param details Token options. 
-	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error. 
+	 * @param details Token options.
+	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string token) {...}; 
+	 * function(string token) {...};
 	 */
 	export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
 	/**
@@ -3774,32 +3414,32 @@ declare module chrome.identity {
 	/**
 	 * Removes an OAuth2 access token from the Identity API's token cache.
 	 * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-	 * @param details Token information. 
-	 * @param callback Called when the token has been removed from the cache. 
+	 * @param details Token information.
+	 * @param callback Called when the token has been removed from the cache.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
 	/**
 	 * Starts an auth flow at the specified URL.
 	 * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
 	 * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-	 * @param details WebAuth flow options. 
-	 * @param callback Called with the URL redirected back to your application. 
+	 * @param details WebAuth flow options.
+	 * @param callback Called with the URL redirected back to your application.
 	 * The callback parameter should be a function that looks like this:
-	 * function(string responseUrl) {...}; 
+	 * function(string responseUrl) {...};
 	 */
 	export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
 	/**
 	 * Generates a redirect URL to be used in launchWebAuthFlow.
 	 * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
 	 * @since Chrome 33.
-	 * @param path Optional. The path appended to the end of the generated URL. 
+	 * @param path Optional. The path appended to the end of the generated URL.
 	 */
-	export function getRedirectURL(path?: string): void;
+	export function getRedirectURL(path?: string): string;
 
 	/**
-	 * Fired when signin state changes for an account on the user's profile. 
+	 * Fired when signin state changes for an account on the user's profile.
 	 * @since Chrome 33.
 	 */
 	var onSignInChanged: SignInChangeEvent;
@@ -3809,31 +3449,25 @@ declare module chrome.identity {
 // Idle
 ////////////////////
 /**
- * Use the chrome.idle API to detect when the machine's idle state changes. 
- * Permissions:  "idle"   
+ * Use the chrome.idle API to detect when the machine's idle state changes.
+ * Permissions:  "idle"
  * @since Chrome 6.
  */
-declare module chrome.idle {
-    interface IdleStateChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( IdleState newState) {...}; 
-		 */
-        addListener(callback: (newState: string) => void): void;
-    }
+declare namespace chrome.idle {
+    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
 
 	/**
-	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise. 
-	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected. 
-	 * Since Chrome 25. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( IdleState newState) {...}; 
+	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+	 * Since Chrome 25.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( IdleState newState) {...};
 	 */
 	export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
 	/**
-	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds. 
+	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
 	 * @since Chrome 25.
-	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state. 
+	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
 	 */
 	export function setDetectionInterval(intervalInSeconds: number): void;
 
@@ -3845,21 +3479,21 @@ declare module chrome.idle {
 // Input - IME
 ////////////////////
 /**
- * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window. 
- * Permissions:  "input"   
+ * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window.
+ * Permissions:  "input"
  * @since Chrome 21.
  */
-declare module chrome.input.ime {
+declare namespace chrome.input.ime {
 	/** See http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent */
     interface KeyboardEvent {
 		/**
 		 * Optional.
-		 * Whether or not the SHIFT key is pressed. 
+		 * Whether or not the SHIFT key is pressed.
 		 */
         shiftKey?: boolean;
 		/**
 		 * Optional.
-		 * Whether or not the ALT key is pressed. 
+		 * Whether or not the ALT key is pressed.
 		 */
         altKey?: boolean;
 		/** The ID of the request. */
@@ -3868,32 +3502,32 @@ declare module chrome.input.ime {
         key: string;
 		/**
 		 * Optional.
-		 * Whether or not the CTRL key is pressed. 
+		 * Whether or not the CTRL key is pressed.
 		 */
         ctrlKey?: boolean;
 		/** One of keyup or keydown. */
         type: string;
 		/**
 		 * Optional.
-		 * The extension ID of the sender of this keyevent. 
+		 * The extension ID of the sender of this keyevent.
 		 * @since Chrome 34.
 		 */
 		extensionId?: string;
 		/**
 		 * Optional.
-		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state. 
+		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state.
 		 * @since Chrome 26.
 		 */
 		code: string;
 		/**
 		 * Optional.
-		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed. 
+		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed.
 		 * @since Chrome 37.
 		 */
 		keyCode?: number;
 		/**
 		 * Optional.
-		 * Whether or not the CAPS_LOCK is enabled. 
+		 * Whether or not the CAPS_LOCK is enabled.
 		 * @since Chrome 29.
 		 */
 		capsLock?: boolean;
@@ -3906,22 +3540,22 @@ declare module chrome.input.ime {
 		/** Type of value this text field edits, (Text, Number, URL, etc) */
         type: string;
 		/**
-		 * Whether the text field wants auto-correct. 
+		 * Whether the text field wants auto-correct.
 		 * @since Chrome 40.
 		 */
 		autoCorrect: boolean;
 		/**
-		 * Whether the text field wants auto-complete. 
+		 * Whether the text field wants auto-complete.
 		 * @since Chrome 40.
 		 */
 		autoComplete: boolean;
 		/**
-		 * Whether the text field wants spell-check. 
+		 * Whether the text field wants spell-check.
 		 * @since Chrome 40.
 		 */
 		spellCheck: boolean;
 	}
-	
+
 	/**
 	 * A menu item used by an input method to interact with the user from the language menu.
 	 * @since Chrome 30.
@@ -3967,24 +3601,24 @@ declare module chrome.input.ime {
 		candidate: string;
 		/** The candidate's id */
 		id: number;
-		/** 
+		/**
 		 * Optional.
-		 * The id to add these candidates under 
+		 * The id to add these candidates under
 		 */
 		parentId?: number;
 		/**
 		 * Optional.
-		 * Short string displayed to next to the candidate, often the shortcut key or index 
+		 * Short string displayed to next to the candidate, often the shortcut key or index
 		 */
 		label?: string;
 		/**
 		 * Optional.
-		 * Additional text describing the candidate 
+		 * Additional text describing the candidate
 		 */
 		annotation?: string;
 		/**
 		 * Optional.
-		 * The usage or detail description of word. 
+		 * The usage or detail description of word.
 		 */
 		usage?: CandidateUsage;
 	}
@@ -4028,37 +3662,37 @@ declare module chrome.input.ime {
 	interface CandidateWindowParameterProperties {
 		/**
 		 * Optional.
-		 * True to show the cursor, false to hide it. 
+		 * True to show the cursor, false to hide it.
 		 */
         cursorVisible?: boolean;
 		/**
 		 * Optional.
-		 * True if the candidate window should be rendered vertical, false to make it horizontal. 
+		 * True if the candidate window should be rendered vertical, false to make it horizontal.
 		 */
         vertical?: boolean;
 		/**
 		 * Optional.
-		 * The number of candidates to display per page. 
+		 * The number of candidates to display per page.
 		 */
         pageSize?: number;
 		/**
 		 * Optional.
-		 * True to display the auxiliary text, false to hide it. 
+		 * True to display the auxiliary text, false to hide it.
 		 */
         auxiliaryTextVisible?: boolean;
 		/**
 		 * Optional.
-		 * Text that is shown at the bottom of the candidate window. 
+		 * Text that is shown at the bottom of the candidate window.
 		 */
         auxiliaryText?: string;
 		/**
 		 * Optional.
-		 * True to show the Candidate window, false to hide it. 
+		 * True to show the Candidate window, false to hide it.
 		 */
         visible?: boolean;
-		/** 
+		/**
 		 * Optional.
-		 * Where to display the candidate window. 
+		 * Where to display the candidate window.
 		 * @since Chrome 28.
 		 */
 		windowPosition?: string;
@@ -4109,180 +3743,104 @@ declare module chrome.input.ime {
 		anchor: number;
     }
 
-    interface BlurEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(integer contextID) {...};
-		 * Parameter contextID: The ID of the text field that has lost focus. The ID is invalid after this call 
-		 */
-        addListener(callback: (contextID: number) => void): void;
-    }
+    interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
 
-    interface CandidateClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID, integer candidateID, MouseButton button) {...};
-		 * Parameter engineID: ID of the engine receiving the event
-		 * Parameter candidateID: ID of the candidate that was clicked. 
-		 * Parameter button: Which mouse buttons was clicked. 
-		 */
-        addListener(callback: (engineID: string, candidateID: number, button: string) => void): void;
-    }
+    interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
 
-    interface KeyEventEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID, KeyboardEvent keyData) {...};
-		 * Parameter engineID: ID of the engine receiving the event
-		 * Parameter keyData: Data on the key event 
-		 */
-        addListener(callback: (engineID: string, keyData: KeyboardEvent) => void): void;
-    }
+    interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
 
-    interface DeactivatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID) {...};
-		 * Parameter engineID: ID of the engine receiving the event 
-		 */
-        addListener(callback: (engineID: string) => void): void;
-    }
+    interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
 
-    interface InputContextUpdateEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( InputContext context) {...};
-		 * Parameter context: An InputContext object describing the text field that has changed. 
-		 */
-        addListener(callback: (context: InputContext) => void): void;
-    }
+    interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
 
-    interface ActivateEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID, ScreenType screen) {...}; 
-		 * Parameter engineID: ID of the engine receiving the event 
-		 * Parameter The screen type under which the IME is activated. 
-		 */
-		addListener(callback: (engineID: string, screen: string) => void): void;
-    }
+    interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
 
-    interface FocusEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( InputContext context) {...};
-		 * Parameter context: Describes the text field that has acquired focus. 
-		 */
-        addListener(callback: (context: InputContext) => void): void;
-    }
+    interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
 
-    interface MenuItemActivatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID, string name) {...}; 
-		 * Parameter engineID: ID of the engine receiving the event 
-		 * Parameter name: Name of the MenuItem which was activated 
-		 */
-        addListener(callback: (engineID: string, name: string) => void): void;
-    }
+    interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
 
-	interface SurroundingTextChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID, object surroundingInfo) {...};
-		 * Parameter engineID: ID of the engine receiving the event
-		 * Parameter surroundingInfo: The surrounding information. 
-		 */
-		addListener(callback: (engineID: string, surroundingInfo: SurroundingTextInfo) => void): void;
-	}
+	interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
 
-	interface InputResetEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string engineID) {...};
-		 * Parameter engineID: ID of the engine receiving the event 
-		 */
-		addListener(callback: (engineID: string) => void): void;
-	}
+	interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
 
 	/**
-	 * Adds the provided menu items to the language menu when this IME is active. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Adds the provided menu items to the language menu when this IME is active.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setMenuItems(parameters: ImeParameters, callback?: () => void): void;
 	/**
-	 * Commits the provided text to the current input. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	 * Commits the provided text to the current input.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Sets the current candidate list. This fails if this extension doesn't own the active IME 
-	 * @param callback Called when the operation completes. 
+	 * Sets the current candidate list. This fails if this extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
-	/** 
-	 * Set the current composition. If this extension does not own the active IME, this fails. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	/**
+	 * Set the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Updates the state of the MenuItems specified 
-	 * @param callback Called when the operation completes 
+	 * Updates the state of the MenuItems specified
+	 * @param callback Called when the operation completes
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function updateMenuItems(parameters: MenuItemParameters, callback?: () => void): void;
 	/**
-	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME 
-	 * @param callback Called when the operation completes. 
+	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
 	export function setCandidateWindowProperties(parameters: CandidateWindowParameter, callback?: (success: boolean) => void): void;
 	/**
-	 * Clear the current composition. If this extension does not own the active IME, this fails. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	 * Clear the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME. 
-	 * @param callback Called when the operation completes 
+	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME.
+	 * @param callback Called when the operation completes
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system. 
+	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system.
 	 * @since Chrome 33.
-	 * @param callback Called when the operation completes. 
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function sendKeyEvents(parameters: SendKeyEventParameters, callback?: () => void): void;
 	/**
-	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing. 
+	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing.
 	 * @since Chrome 34.
 	 */
 	export function hideInputView(): void;
 	/**
-	 * Deletes the text around the caret. 
+	 * Deletes the text around the caret.
 	 * @since Chrome 27.
 	 */
 	export function deleteSurroundingText(parameters: DeleteSurroundingTextParameters, callback?: () => void): void;
 	/**
-	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous. 
+	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous.
 	 * @since Chrome 25.
-	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId 
-	 * @param response True if the keystroke was handled, false if not 
+	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId
+	 * @param response True if the keystroke was handled, false if not
 	 */
 	export function keyEventHandled(requestId: string, response: boolean): void;
 
@@ -4303,12 +3861,12 @@ declare module chrome.input.ime {
 	/** Called when the user selects a menu item */
     var onMenuItemActivated: MenuItemActivatedEvent;
 	/**
-	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction. 
+	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction.
 	 * @since Chrome 27.
 	 */
 	var onSurroundingTextChanged: SurroundingTextChangedEvent;
 	/**
-	 * This event is sent when chrome terminates ongoing text input session. 
+	 * This event is sent when chrome terminates ongoing text input session.
 	 * @since Chrome 29.
 	 */
 	var onReset: InputResetEvent;
@@ -4318,38 +3876,38 @@ declare module chrome.input.ime {
 // Management
 ////////////////////
 /**
- * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page. 
- * Permissions:  "management"   
+ * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page.
+ * Permissions:  "management"
  * @since Chrome 8.
  */
-declare module chrome.management {
+declare namespace chrome.management {
 	/** Information about an installed extension, app, or theme. */
     interface ExtensionInfo {
 		/**
 		 * Optional.
-		 * A reason the item is disabled. 
+		 * A reason the item is disabled.
 		 * @since Chrome 17.
 		 */
         disabledReason?: string;
 		/** Optional. The launch url (only present for apps). */
         appLaunchUrl?: string;
 		/**
-		 * The description of this extension, app, or theme. 
+		 * The description of this extension, app, or theme.
 		 * @since Chrome 9.
 		 */
         description: string;
 		/**
-		 * Returns a list of API based permissions. 
+		 * Returns a list of API based permissions.
 		 * @since Chrome 9.
 		 */
         permissions: string[];
 		/**
 		 * Optional.
-		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details. 
+		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details.
 		 */
         icons?: IconInfo[];
 		/**
-		 * Returns a list of host based permissions. 
+		 * Returns a list of host based permissions.
 		 * @since Chrome 9.
 		 */
         hostPermissions: string[];
@@ -4357,17 +3915,17 @@ declare module chrome.management {
         enabled: boolean;
 		/**
 		 * Optional.
-		 * The URL of the homepage of this extension, app, or theme. 
+		 * The URL of the homepage of this extension, app, or theme.
 		 * @since Chrome 11.
 		 */
         homepageUrl?: string;
 		/**
-		 * Whether this extension can be disabled or uninstalled by the user. 
+		 * Whether this extension can be disabled or uninstalled by the user.
 		 * @since Chrome 12.
 		 */
         mayDisable: boolean;
 		/**
-		 * How the extension was installed. 
+		 * How the extension was installed.
 		 * @since Chrome 22.
 		 */
         installType: string;
@@ -4376,18 +3934,18 @@ declare module chrome.management {
 		/** The extension's unique identifier. */
         id: string;
 		/**
-		 * Whether the extension, app, or theme declares that it supports offline. 
+		 * Whether the extension, app, or theme declares that it supports offline.
 		 * @since Chrome 15.
 		 */
         offlineEnabled: boolean;
 		/**
 		 * Optional.
-		 * The update URL of this extension, app, or theme. 
+		 * The update URL of this extension, app, or theme.
 		 * @since Chrome 16.
 		 */
         updateUrl?: string;
 		/**
-		 * The type of this extension, app, or theme. 
+		 * The type of this extension, app, or theme.
 		 * @since Chrome 23.
 		 */
         type: string;
@@ -4396,24 +3954,24 @@ declare module chrome.management {
 		/** The name of this extension, app, or theme. */
         name: string;
 		/**
-		 * A short version of the name of this extension, app, or theme. 
+		 * A short version of the name of this extension, app, or theme.
 		 * @since Chrome 31.
 		 */
 		shortName: string;
 		/**
 		 * True if this is an app.
-		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type. 
+		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type.
 		 */
 		isApp: boolean;
 		/**
 		 * Optional.
-		 * The app launch type (only present for apps). 
+		 * The app launch type (only present for apps).
 		 * @since Chrome 37.
 		 */
 		launchType?: string;
 		/**
 		 * Optional.
-		 * The currently available launch types (only present for apps). 
+		 * The currently available launch types (only present for apps).
 		 * @since Chrome 37.
 		 */
 		availableLaunchTypes?: string[];
@@ -4430,151 +3988,126 @@ declare module chrome.management {
     interface UninstallOptions {
 		/**
 		 * Optional.
-		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown. 
+		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown.
 		 */
         showConfirmDialog?: boolean;
     }
 
-    interface ManagementDisabledEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( ExtensionInfo info) {...}; 
-		 */
-        addListener(callback: (info: ExtensionInfo) => void): void;
-    }
+    interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
-    interface ManagementUninstalledEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string id) {...};
-		 * Parameter id: The id of the extension, app, or theme that was uninstalled.  
-		 */
-        addListener(callback: (id: string) => void): void;
-    }
+    interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
 
-    interface ManagementInstalledEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( ExtensionInfo info) {...}; 
-		 */
-        addListener(callback: (info: ExtensionInfo) => void): void;
-    }
+    interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
-    interface ManagementEnabledEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( ExtensionInfo info) {...}; 
-		 */
-        addListener(callback: (info: ExtensionInfo) => void): void;
-    }
+    interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
 	/**
-	 * Enables or disables an app or extension. 
-	 * @param id This should be the id from an item of management.ExtensionInfo. 
-	 * @param enabled Whether this item should be enabled or disabled. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Enables or disables an app or extension.
+	 * @param id This should be the id from an item of management.ExtensionInfo.
+	 * @param enabled Whether this item should be enabled or disabled.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setEnabled(id: string, enabled: boolean, callback?: () => void): void;
 	/**
-	 * Returns a list of permission warnings for the given extension id. 
+	 * Returns a list of permission warnings for the given extension id.
 	 * @since Chrome 15.
-	 * @param id The ID of an already installed extension. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of string permissionWarnings) {...}; 
+	 * @param id The ID of an already installed extension.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
 	 */
     export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
 	/**
-	 * Returns information about the installed extension, app, or theme that has the given ID. 
+	 * Returns information about the installed extension, app, or theme that has the given ID.
 	 * @since Chrome 9.
-	 * @param id The ID from an item of management.ExtensionInfo. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param id The ID from an item of management.ExtensionInfo.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
     export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
 	/**
-	 * Returns a list of information about installed extensions and apps. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of ExtensionInfo result) {...}; 
+	 * Returns a list of information about installed extensions and apps.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of ExtensionInfo result) {...};
 	 */
     export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
 	/**
-	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest. 
+	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest.
 	 * @since Chrome 15.
-	 * @param manifestStr Extension manifest JSON string. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of string permissionWarnings) {...}; 
+	 * @param manifestStr Extension manifest JSON string.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
 	 */
     export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
 	/**
-	 * Launches an application. 
-	 * @param id The extension id of the application. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Launches an application.
+	 * @param id The extension id of the application.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function launchApp(id: string, callback?: () => void): void;
 	/**
 	 * Uninstalls a currently installed app or extension.
-	 * @since Chrome 21. 
+	 * @since Chrome 21.
 	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstall(id: string, options?: UninstallOptions, callback?: () => void): void;
 	/**
 	 * Uninstalls a currently installed app or extension.
-	 * @deprecated since Chrome 21. The options parameter was added to this function. 
+	 * @deprecated since Chrome 21. The options parameter was added to this function.
 	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstall(id: string, callback?: () => void): void;
 	/**
-	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest. 
+	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest.
 	 * @since Chrome 39.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
 	export function getSelf(callback?: (result: ExtensionInfo) => void): void;
 	/**
-	 * Uninstalls the calling extension. 
+	 * Uninstalls the calling extension.
 	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstallSelf(options?: UninstallOptions, callback?: () => void): void;
 	/**
-	 * Uninstalls the calling extension. 
+	 * Uninstalls the calling extension.
 	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstallSelf(callback?: () => void): void;
 	/**
-	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created. 
+	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created.
 	 * @since Chrome 37.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function createAppShortcut(id: string, callback?: () => void): void;
 	/**
-	 * Set the launch type of an app. 
+	 * Set the launch type of an app.
 	 * @since Chrome 37.
-	 * @param id This should be the id from an app item of management.ExtensionInfo. 
-	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param id This should be the id from an app item of management.ExtensionInfo.
+	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setLaunchType(id: string, launchType: string, callback?: () => void): void;
 	/**
-	 * Generate an app for a URL. Returns the generated bookmark app. 
+	 * Generate an app for a URL. Returns the generated bookmark app.
 	 * @since Chrome 37.
-	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https". 
-	 * @param title The title of the generated app. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https".
+	 * @param title The title of the generated app.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
 	export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
 
@@ -4592,12 +4125,12 @@ declare module chrome.management {
 // Notifications
 ////////////////////
 /**
- * Use the networking.config API to authenticate to captive portals. 
- * Permissions:  "networking.config"   
- * Important: This API works only on Chrome OS. 
+ * Use the networking.config API to authenticate to captive portals.
+ * Permissions:  "networking.config"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
-declare module chrome.networking.config {
+declare namespace chrome.networking.config {
 	interface NetworkInfo {
 		/** Currently only WiFi supported. */
 		Type: string;
@@ -4613,37 +4146,30 @@ declare module chrome.networking.config {
 		Security?: string;
 	}
 
-	interface CaptivePorttalDetectedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( NetworkInfo networkInfo) {...};
-		 * Parameter networkInfo: Information about the network on which a captive portal was detected.  
-		 */
-		addListener(callback: (networkInfo: NetworkInfo) => void): void;
-	}
-	
+	interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
+
 	/**
-	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list. 
-	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored. 
-	 * @param callback Called back when this operation is finished. 
+	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
+	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored.
+	 * @param callback Called back when this operation is finished.
 	 * The callback parameter should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function setNetworkFilter(networks: NetworkInfo[], callback: () => void): void;
 	/**
-	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event. 
-	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected. 
-	 * @param result The result of the authentication attempt. 
+	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event.
+	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected.
+	 * @param result The result of the authentication attempt.
 	 * unhandled: The extension does not handle this network or captive portal (e.g. server end-point not found or not compatible).
 	 * succeeded: The extension handled this network and authenticated successfully.
 	 * rejected: The extension handled this network, tried to authenticate, however was rejected by the server.
-	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error. 
-	 * @param callback Called back when this operation is finished. 
+	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error.
+	 * @param callback Called back when this operation is finished.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function finishAuthentication(GUID: string, result: string, callback?: () => void): void;
-	
+
 	/** This event fires everytime a captive portal is detected on a network matching any of the currently registered network filters and the user consents to use the extension for authentication. Network filters may be set using the setNetworkFilter. Upon receiving this event the extension should start its authentication attempt with the captive portal. When the extension finishes its attempt, it must call finishAuthentication with the GUID received with this event and the appropriate authentication result. */
 	var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
 }
@@ -4653,11 +4179,11 @@ declare module chrome.networking.config {
 // https://developer.chrome.com/extensions/notifications
 ////////////////////
 /**
- * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray. 
- * Permissions:  "notifications" 
+ * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+ * Permissions:  "notifications"
  * @since Chrome 28.
  */
-declare module chrome.notifications {
+declare namespace chrome.notifications {
     interface ButtonOptions {
         title: string;
         iconUrl?: string;
@@ -4673,7 +4199,7 @@ declare module chrome.notifications {
     interface NotificationOptions {
 		/** Optional. Which type of notification to display. Required for notifications.create method. */
         type?: string;
-		/** 
+		/**
 		 * Optional.
 		 * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
 		 * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
@@ -4685,7 +4211,7 @@ declare module chrome.notifications {
         message?: string;
 		/**
 		 * Optional.
-		 * Alternate notification content with a lower-weight font. 
+		 * Alternate notification content with a lower-weight font.
 		 * @since Chrome 31.
 		 */
         contextMessage?: string;
@@ -4699,19 +4225,19 @@ declare module chrome.notifications {
 		items?: ItemOptions[];
 		/**
 		 * Optional.
-		 * Current progress ranges from 0 to 100. 
+		 * Current progress ranges from 0 to 100.
 		 * @since Chrome 30.
 		 */
         progress?: number;
 		/**
 		 * Optional.
-		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification. 
+		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
 		 * @since Chrome 32.
 		 */
         isClickable?: boolean;
 		/**
 		 * Optional.
-		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered. 
+		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
 		 * @since Chrome 38.
 		 */
 		appIconMaskUrl?: string;
@@ -4719,45 +4245,15 @@ declare module chrome.notifications {
 		imageUrl?: string;
     }
 
-	interface NotificationClosedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string notificationId, boolean byUser) {...}; 
-		 */
-        addListener(callback: (notificationId: string, byUser: boolean) => void): void;
-    }
+	interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
 
-	interface NotificationClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string notificationId) {...}; 
-		 */
-        addListener(callback: (notificationId: string) => void): void;
-    }
+	interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
 
-	interface NotificationButtonClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string notificationId, integer buttonIndex) {...}; 
-		 */
-        addListener(callback: (notificationId: string, buttonIndex: number) => void): void;
-    }
+	interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
 
-	interface NotificationPermissionLevelChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( PermissionLevel level) {...}; 
-		 */
-        addListener(callback: (level: string) => void): void;
-    }
+	interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
 
-	interface NotificationShowSettingsEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-    }
+	interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
 
 	/** The notification closed, either by the system or by user action. */
 	export var onClosed: NotificationClosedEvent;
@@ -4766,71 +4262,71 @@ declare module chrome.notifications {
 	/** The user pressed a button in the notification. */
 	export var onButtonClicked: NotificationButtonClickedEvent;
 	/**
-	 * The user changes the permission level. 
+	 * The user changes the permission level.
 	 * @since Chrome 32.
 	 */
 	export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
 	/**
-	 * The user clicked on a link for the app's notification settings. 
+	 * The user clicked on a link for the app's notification settings.
 	 * @since Chrome 32.
 	 */
 	export var onShowSettings: NotificationShowSettingsEvent;
 
 	/**
-	 * Creates and displays a notification. 
+	 * Creates and displays a notification.
 	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
 	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification. 
+	 * @param options Contents of the notification.
 	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...}; 
+	 * function(string notificationId) {...};
 	 */
 	export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
 	/**
-	 * Creates and displays a notification. 
+	 * Creates and displays a notification.
 	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
 	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification. 
+	 * @param options Contents of the notification.
 	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...}; 
+	 * function(string notificationId) {...};
 	 */
 	export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
 	/**
-	 * Updates an existing notification. 
-	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method. 
-	 * @param options Contents of the notification to update to. 
+	 * Updates an existing notification.
+	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+	 * @param options Contents of the notification to update to.
 	 * @param callback Called to indicate whether a matching notification existed.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasUpdated) {...}; 
+	 * function(boolean wasUpdated) {...};
 	 */
 	export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
 	/**
-	 * Clears the specified notification. 
-	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method. 
+	 * Clears the specified notification.
+	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
 	 * @param callback Called to indicate whether a matching notification existed.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
 	export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Retrieves all the notifications. 
+	 * Retrieves all the notifications.
 	 * @since Chrome 29.
-	 * @param callback Returns the set of notification_ids currently in the system. 
+	 * @param callback Returns the set of notification_ids currently in the system.
 	 * The callback parameter should be a function that looks like this:
-	 * function(object notifications) {...}; 
+	 * function(object notifications) {...};
 	 */
 	export function getAll(callback: (notifications: Object) => void): void;
 	/**
-	 * Retrieves whether the user has enabled notifications from this app or extension. 
+	 * Retrieves whether the user has enabled notifications from this app or extension.
 	 * @since Chrome 32.
-	 * @param callback Returns the current permission level. 
+	 * @param callback Returns the current permission level.
 	 * The callback parameter should be a function that looks like this:
-	 * function( PermissionLevel level) {...}; 
+	 * function( PermissionLevel level) {...};
 	 */
     export function getPermissionLevel(callback: (level: string) => void): void;
 }
@@ -4839,11 +4335,11 @@ declare module chrome.notifications {
 // Omnibox
 ////////////////////
 /**
- * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox. 
+ * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox.
  * Manifest:  "omnibox": {...}
- * @since Chrome 9.   
+ * @since Chrome 9.
  */
-declare module chrome.omnibox {
+declare namespace chrome.omnibox {
 	/** A suggest result. */
     interface SuggestResult {
 		/** The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry. */
@@ -4857,44 +4353,17 @@ declare module chrome.omnibox {
         description: string;
     }
 
-    interface OmniboxInputEnteredEvent extends chrome.events.Event {
-		/**
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string text, OnInputEnteredDisposition disposition) {...}; 
-		 */
-        addListener(callback: (text: string) => void): void;
-    }
+    interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
 
-    interface OmniboxInputChangedEvent extends chrome.events.Event {
-		/**
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string text, function suggest) {...};
-		 * Parameter suggest: A callback passed to the onInputChanged event used for sending suggestions back to the browser.
-		 * The suggest parameter should be a function that looks like this:
-		 * function(array of SuggestResult suggestResults) {...}; 
-		 */
-        addListener(callback: (text: string, suggest: (suggestResults: SuggestResult[]) => void) => void): void;
-    }
+    interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
 
-    interface OmniboxInputStartedEvent extends chrome.events.Event {
-		/** 
-		 * The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-    }
+    interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
 
-    interface OmniboxInputCancelledEvent extends chrome.events.Event {
-		/**
-		 * The callback parameter should be a function that looks like this: 
-		 * function() {...}; 
-		 */
-		addListener(callback: () => void): void;
-    }
+    interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
 
 	/**
-	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar. 
-	 * @param suggestion A partial SuggestResult object, without the 'content' parameter. 
+	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
+	 * @param suggestion A partial SuggestResult object, without the 'content' parameter.
 	 */
     export function setDefaultSuggestion(suggestion: Suggestion): void;
 
@@ -4912,18 +4381,12 @@ declare module chrome.omnibox {
 // Page Action
 ////////////////////
 /**
- * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages. 
- * Manifest:  "page_action": {...}   
+ * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages.
+ * Manifest:  "page_action": {...}
  * @since Chrome 5.
  */
-declare module chrome.pageAction {
-    interface PageActionClickedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( tabs.Tab tab) {...}; 
-		 */
-        addListener(callback: (tab: chrome.tabs.Tab) => void): void;
-    }
+declare namespace chrome.pageAction {
+    interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
     interface TitleDetails {
 		/** The id of the tab for which you want to modify the page action. */
@@ -4949,29 +4412,29 @@ declare module chrome.pageAction {
         tabId: number;
 		/**
 		 * Optional.
-		 * @deprecated This argument is ignored. 
+		 * @deprecated This argument is ignored.
 		 */
         iconIndex?: number;
 		/**
 		 * Optional.
-		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}' 
+		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
 		 */
         imageData?: ImageData;
 		/**
 		 * Optional.
-		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}' 
+		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
 		 */
         path?: any;
     }
 
 	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected. 
-	 * @param tabId The id of the tab for which you want to modify the page action. 
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
 	 */
     export function hide(tabId: number): void;
 	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected. 
-	 * @param tabId The id of the tab for which you want to modify the page action. 
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
 	 */
     export function show(tabId: number): void;
 	/** Sets the title of the page action. This is displayed in a tooltip over the page action. */
@@ -4979,23 +4442,23 @@ declare module chrome.pageAction {
 	/** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
     export function setPopup(details: PopupDetails): void;
 	/**
-	 * Gets the title of the page action. 
+	 * Gets the title of the page action.
 	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(string result) {...};
 	 */
     export function getTitle(details: GetDetails, callback: (result: string) => void): void;
 	/**
-	 * Gets the html document set as the popup for this page action. 
+	 * Gets the html document set as the popup for this page action.
 	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getPopup(details: GetDetails, callback: (result: string) => void): void;
 	/**
-	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setIcon(details: IconDetails, callback?: () => void): void;
 
@@ -5007,22 +4470,22 @@ declare module chrome.pageAction {
 // Page Capture
 ////////////////////
 /**
- * Use the chrome.pageCapture API to save a tab as MHTML. 
- * Permissions:  "pageCapture"   
+ * Use the chrome.pageCapture API to save a tab as MHTML.
+ * Permissions:  "pageCapture"
  * @since Chrome 18.
  */
-declare module chrome.pageCapture {
+declare namespace chrome.pageCapture {
     interface SaveDetails {
 		/** The id of the tab to save as MHTML. */
         tabId: number;
     }
 
 	/**
-	 * Saves the content of the tab with given id as MHTML. 
-	 * @param callback Called when the MHTML has been generated. 
+	 * Saves the content of the tab with given id as MHTML.
+	 * @param callback Called when the MHTML has been generated.
 	 * The callback parameter should be a function that looks like this:
 	 * function(binary mhtmlData) {...};
-	 * Parameter mhtmlData: The MHTML data as a Blob.  
+	 * Parameter mhtmlData: The MHTML data as a Blob.
 	 */
     export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
 }
@@ -5031,67 +4494,67 @@ declare module chrome.pageCapture {
 // Permissions
 ////////////////////
 /**
- * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary. 
+ * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
  * @since Chrome 16.
  */
-declare module chrome.permissions {
+declare namespace chrome.permissions {
     interface Permissions {
 		/**
 		 * Optional.
-		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest. 
+		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
 		 */
         origins?: string[];
 		/**
 		 * Optional.
-		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored. 
+		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
 		 */
         permissions?: string[];
     }
 
     interface PermissionsRemovedEvent {
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
+		 * @param callback The callback parameter should be a function that looks like this:
 		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The permissions that have been removed.  
+		 * Parameter permissions: The permissions that have been removed.
 		 */
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
     interface PermissionsAddedEvent {
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
+		 * @param callback The callback parameter should be a function that looks like this:
 		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The newly acquired permissions.  
+		 * Parameter permissions: The newly acquired permissions.
 		 */
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
 	/**
-	 * Checks if the extension has the specified permissions. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Checks if the extension has the specified permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean result) {...};
-	 * Parameter result: True if the extension has the specified permissions.  
+	 * Parameter result: True if the extension has the specified permissions.
 	 */
     export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
 	/**
-	 * Gets the extension's current set of permissions. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Gets the extension's current set of permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function( Permissions permissions) {...};
-	 * Parameter permissions: The extension's active permissions.  
+	 * Parameter permissions: The extension's active permissions.
 	 */
     export function getAll(callback: (permissions: Permissions) => void): void;
 	/**
-	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
+	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean granted) {...};
-	 * Parameter granted: True if the user granted the specified permissions.  
+	 * Parameter granted: True if the user granted the specified permissions.
 	 */
     export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
 	/**
-	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
+	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean removed) {...};
-	 * Parameter removed: True if the permissions were removed.  
+	 * Parameter removed: True if the permissions were removed.
 	 */
     export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
@@ -5105,12 +4568,12 @@ declare module chrome.permissions {
 // Platform Keys
 ////////////////////
 /**
- * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider). 
- * Permissions:  "platformKeys"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider).
+ * Permissions:  "platformKeys"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 45.
  */
-declare module chrome.platformKeys {
+declare namespace chrome.platformKeys {
 	interface Match {
 		/** The DER encoding of a X.509 certificate. */
 		certificate: ArrayBuffer;
@@ -5130,7 +4593,7 @@ declare module chrome.platformKeys {
 		request: ClientCertificateSelectRequestDetails;
 		/**
 		 * Optional.
-		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed. 
+		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed.
 		 */
 		clientCerts?: ArrayBuffer[];
 		/** If true, the filtered list is presented to the user to manually select a certificate and thereby granting the extension access to the certificate(s) and key(s). Only the selected certificate(s) will be returned. If is false, the list is reduced to all certificates that the extension has been granted access to (automatically or manually). */
@@ -5153,30 +4616,30 @@ declare module chrome.platformKeys {
 		 */
 		debug_errors: string[];
 	}
-	
+
 	/**
-	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(array of Match matches) {...};
-	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.  
+	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.
 	 */
 	export function selectClientCertificates(details: ClientCertificateSelectDetails, callback: (matches: Match[]) => void): void;
 	/**
-	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback. 
-	 * @param certificate The certificate of a Match returned by selectClientCertificates. 
-	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data. 
-	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto. 
+	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback.
+	 * @param certificate The certificate of a Match returned by selectClientCertificates.
+	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data.
+	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto.
 	 * The callback parameter should be a function that looks like this:
 	 * function(object publicKey, object privateKey) {...};
-	 * Optional parameter privateKey: Might be null if this extension does not have access to it.  
+	 * Optional parameter privateKey: Might be null if this extension does not have access to it.
 	 */
 	export function getKeyPair(certificate: ArrayBuffer, parameters: Object, callback: (publicKey: CryptoKey, privateKey?: CryptoKey) => void): void;
 	/** An implementation of WebCrypto's  SubtleCrypto that allows crypto operations on keys of client certificates that are available to this extension. */
 	export function subtleCrypto(): SubtleCrypto;
 	/**
-	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function verifyTLSServerCertificate(details: ServerCertificateVerificationDetails, callback: (result: ServerCertificateVerificationResult) => void): void;
 }
@@ -5185,11 +4648,11 @@ declare module chrome.platformKeys {
 // Power
 ////////////////////
 /**
- * Use the chrome.power API to override the system's power management features. 
- * Permissions:  "power"   
+ * Use the chrome.power API to override the system's power management features.
+ * Permissions:  "power"
  * @since Chrome 27.
  */
-declare module chrome.power {
+declare namespace chrome.power {
 	/** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
 	export function requestKeepAwake(level: string): void;
 	/** Releases a request previously made via requestKeepAwake(). */
@@ -5200,11 +4663,11 @@ declare module chrome.power {
 // Printer Provider
 ////////////////////
 /**
- * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers. 
- * Permissions:  "printerProvider"   
+ * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+ * Permissions:  "printerProvider"
  * @since Chrome 44.
  */
-declare module chrome.printerProvider {
+declare namespace chrome.printerProvider {
 	interface PrinterInfo {
 		/** Unique printer ID. */
 		id: string;
@@ -5232,50 +4695,18 @@ declare module chrome.printerProvider {
 		document: Blob;
 	}
 
-	interface PrinterRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(function resultCallback) {...};
-		 * Parameter resultCallback: Callback to return printer list. Every listener must call callback exactly once.  
-		 */
-		addListener(callback: (resultCallback: (printerInfo: PrinterInfo[]) => void) => void): void;
-	}
+	interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
 
-	interface PrinterInfoRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function( usb.Device device, function resultCallback) {...};
-		 * Parameter device: The USB device.
-		 * Parameter resultCallback: Callback to return printer info. The receiving listener must call callback exactly once. If the parameter to this callback is undefined that indicates that the application has determined that the device is not supported.   
-		 */
-		addListener(callback: (device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void): void;
-	}
+	interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
 
-	interface CapabilityRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(string printerId, function resultCallback) {...};
-		 * Parameter printerId: Unique ID of the printer whose capabilities are requested. 
-		 * Parameter resultCallback: Callback to return device capabilities in CDD format. The receiving listener must call callback exectly once.  
-		 */
-		addListener(callback: (printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void): void;
-	}
+	interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
+
+	interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
 
-	interface PrintRequestedEvent extends chrome.events.Event {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object printJob, function resultCallback) {...};
-		 * Parameter printJob: The printing request parameters. 
-		 * Parameter resultCallback: Callback that should be called when the printing request is completed.
-		 * Parameter result (for resultCallback):   OK: Operation completed successfully. FAILED: General failure. INVALID_TICKET: Print ticket is invalid. For example, ticket is inconsistent with capabilities or extension is not able to handle all settings from the ticket. INVALID_DATA: Document is invalid. For example, data may be corrupted or the format is incompatible with the extension. 
-		 */
-		addListener(callback: (printJob: PrintJob, resultCallback: (result: string) => void) => void): void;
-	}
-	
 	/** Event fired when print manager requests printers provided by extensions. */
 	export var onGetPrintersRequested: PrinterRequestedEvent;
 	/**
-	 * Event fired when print manager requests information about a USB device that may be a printer. 
+	 * Event fired when print manager requests information about a USB device that may be a printer.
 	 * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
 	 * @since Chrome 45.
 	 */
@@ -5290,12 +4721,12 @@ declare module chrome.printerProvider {
 // Privacy
 ////////////////////
 /**
- * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration. 
- * Permissions:  "privacy"   
- * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control. 
+ * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration.
+ * Permissions:  "privacy"
+ * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control.
  * @since Chrome 18.
  */
-declare module chrome.privacy {
+declare namespace chrome.privacy {
     interface Services {
 		/** since Chrome 20. */
         spellingServiceEnabled: chrome.types.ChromeSetting;
@@ -5342,10 +4773,10 @@ declare module chrome.privacy {
 ////////////////////
 /**
  * Use the chrome.proxy API to manage Chrome's proxy settings. This API relies on the ChromeSetting prototype of the type API for getting and setting the proxy configuration.
- * Permissions:  "proxy"   
+ * Permissions:  "proxy"
  * @since Chrome 13.
  */
-declare module chrome.proxy {
+declare namespace chrome.proxy {
     /** An object holding proxy auto-config information. Exactly one of the fields should be non-empty. */
     interface PacScript {
         /** Optional. URL of the PAC file to be used. */
@@ -5362,12 +4793,12 @@ declare module chrome.proxy {
         rules?: ProxyRules;
         /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
         pacScript?: PacScript;
-        /** 
+        /**
          * 'direct' = Never use a proxy
          * 'auto_detect' = Auto detect proxy settings
          * 'pac_script' = Use specified PAC script
          * 'fixed_servers' = Manually specify proxy servers
-         * 'system' = Use system proxy settings 
+         * 'system' = Use system proxy settings
          */
         mode: string;
     }
@@ -5407,13 +4838,7 @@ declare module chrome.proxy {
         fatal: boolean;
     }
 
-    interface ProxyErrorEvent extends chrome.events.Event {
-        /**
-         * @param callback The callback parameter should be a function that looks like this: 
-         * function(object details) {...}; 
-         */
-        addListener(callback: (details: ErrorDetails) => void): void;
-    }
+    interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
 
     var settings: chrome.types.ChromeSetting;
     /** Notifies about proxy errors. */
@@ -5424,10 +4849,10 @@ declare module chrome.proxy {
 // Runtime
 ////////////////////
 /**
- * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs. 
+ * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
  * @since Chrome 22
  */
-declare module chrome.runtime {
+declare namespace chrome.runtime {
     /** This will be defined during an API method callback if there was an error */
     var lastError: LastError;
     /** The ID of the extension/app. */
@@ -5444,18 +4869,18 @@ declare module chrome.runtime {
 
     interface InstalledDetails {
 		/**
-		 * The reason that this event is being dispatched. 
-		 * One of: "install", "update", "chrome_update", or "shared_module_update" 
+		 * The reason that this event is being dispatched.
+		 * One of: "install", "update", "chrome_update", or "shared_module_update"
 		 */
         reason: string;
 		/**
 		 * Optional.
-		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'. 
+		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
 		 */
         previousVersion?: string;
 		/**
 		 * Optional.
-		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'. 
+		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
 		 * @since Chrome 29.
 		 */
 		id?: string;
@@ -5476,17 +4901,17 @@ declare module chrome.runtime {
         /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
         tab?: chrome.tabs.Tab;
         /**
-         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set. 
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
          * @since Chrome 41.
          */
         frameId?: number;
         /**
-         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it. 
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
          * @since Chrome 28.
          */
         url?: string;
         /**
-         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available. 
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
          * @since Chrome 32.
          */
         tlsChannelId?: string;
@@ -5497,19 +4922,19 @@ declare module chrome.runtime {
      * @since Chrome 36.
      */
     interface PlatformInfo {
-        /** 
+        /**
          * The operating system chrome is running on.
-         * One of: "mac", "win", "android", "cros", "linux", or "openbsd" 
+         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
          */
         os: string;
         /**
-         * The machine's processor architecture. 
-         * One of: "arm", "x86-32", or "x86-64" 
+         * The machine's processor architecture.
+         * One of: "arm", "x86-32", or "x86-64"
          */
         arch: string;
         /**
-         * The native client architecture. This may be different from arch on some platforms. 
-         * One of: "arm", "x86-32", or "x86-64" 
+         * The native client architecture. This may be different from arch on some platforms.
+         * One of: "arm", "x86-32", or "x86-64"
          */
         nacl_arch: string;
     }
@@ -5523,11 +4948,11 @@ declare module chrome.runtime {
         disconnect: () => void;
         /**
          * Optional.
-         * This property will only be present on ports passed to onConnect/onConnectExternal listeners. 
+         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
          */
         sender?: MessageSender;
         /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onDisconnect: chrome.events.Event;
+        onDisconnect: chrome.events.Event<() => void>;
         /** An object which allows the addition and removal of listeners for a Chrome event. */
         onMessage: PortMessageEvent;
         name: string;
@@ -5543,151 +4968,331 @@ declare module chrome.runtime {
         version: string;
     }
 
-    interface PortMessageEvent extends chrome.events.Event {
-        addListener(callback: (message: Object, port: Port) => void): void;
-    }
+    interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
 
-    interface ExtensionMessageEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Optional parameter message: The message sent by the calling script. 
-		 * Parameter sendResponse: Function to call (at most once) when you have a response. The argument should be any JSON-ifiable object. If you have more than one onMessage listener in the same document, then only one may send a response. This function becomes invalid when the event listener returns, unless you return true from the event listener to indicate you wish to send a response asynchronously (this will keep the message channel open to the other end until sendResponse is called). 
-		 */
-        addListener(callback: (message: any, sender: MessageSender, sendResponse: Function) => void): void;
-    }
+    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
 
-    interface ExtensionConnectEvent extends chrome.events.Event {
-        addListener(callback: (port: Port) => void): void;
-    }
+    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    interface RuntimeInstalledEvent extends chrome.events.Event {
-        addListener(callback: (details: InstalledDetails) => void): void;
-    }
+    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
 
-	interface RuntimeEvent extends chrome.events.Event {
-		addListener(callback: () => void): void;
-    }
+	interface RuntimeEvent extends chrome.events.Event<() => void> {}
 
-    interface RuntimeRestartRequiredEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter reason: The reason that the event is being dispatched. One of: "app_update", "os_update", or "periodic" 
-		 */
-        addListener(callback: (reason: string) => void): void;
-    }
+    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
 
-    interface RuntimeUpdateAvailableEvent extends chrome.events.Event {
-		/**
-		 * @param callback 
-		 * Parameter details: The manifest details of the available update. 
-		 */
-        addListener(callback: (details: UpdateAvailableDetails) => void): void;
-    }
+    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
+
+	interface ManifestIcons {
+		[size: number]: string;
+	}
+
+	interface ManifestAction {
+		default_icon?: ManifestIcons;
+		default_title?: string;
+		default_popup?: string;
+	}
+
+	interface SearchProvider {
+		name?: string;
+		keyword?: string;
+		favicon_url?: string;
+		search_url: string;
+		encoding?: string;
+		suggest_url?: string;
+		instant_url?: string;
+		image_url?: string;
+		search_url_post_params?: string;
+		suggest_url_post_params?: string;
+		instant_url_post_params?: string;
+		image_url_post_params?: string;
+		alternate_urls?: string[];
+		prepopulated_id?: number;
+		is_default?: boolean;
+	}
+
+	interface Manifest {
+		// Required
+		manifest_version: number;
+		name: string;
+		version: string;
+
+		// Recommended
+		default_locale?: string;
+		description?: string;
+		icons?: ManifestIcons;
+
+		// Pick one (or none)
+		browser_action?: ManifestAction;
+		page_action?: ManifestAction;
+
+		// Optional
+		author?: any;
+		automation?: any;
+		background?: {
+			scripts?: string[];
+			page?: string;
+			persistent?: boolean;
+		};
+		background_page?: string;
+		chrome_settings_overrides?: {
+			homepage?: string;
+			search_provider?: SearchProvider;
+			startup_pages?: string[];
+		};
+		chrome_ui_overrides?: {
+			bookmarks_ui?: {
+				remove_bookmark_shortcut?: boolean;
+				remove_button?: boolean;
+			}
+		};
+		chrome_url_overrides?: {
+			bookmarks?: string;
+			history?: string;
+			newtab?: string;
+		};
+		commands?: {
+			[name: string]: {
+				suggested_key?: {
+                    default?: string;
+					windows?: string;
+					mac?: string;
+					chromeos?: string;
+					linux?: string;
+				};
+				description?: string;
+				global?: boolean
+			}
+		};
+		content_capabilities?: {
+			matches?: string[];
+			permissions?: string[];
+		};
+		content_scripts?: {
+			matches?: string[];
+			exclude_matches?: string[];
+			css?: string[];
+			js?: string[];
+			run_at?: string;
+			all_frames?: boolean;
+			include_globs?: string[];
+			exclude_globs?: string[];
+		}[];
+		content_security_policy?: string;
+		converted_from_user_script?: boolean;
+		copresence?: any;
+		current_locale?: string;
+		devtools_page?: string;
+		event_rules?: {
+			event?: string;
+			actions?: {
+				type: string;
+			}[];
+            conditions?: chrome.declarativeContent.PageStateMatcher[]
+		}[];
+		externally_connectable?: {
+            ids?: string[];
+			matches?: string[];
+            accepts_tls_channel_id?: boolean;
+		};
+		file_browser_handlers?: {
+			id?: string;
+			default_title?: string;
+			file_filters?: string[];
+		}[];
+		file_system_provider_capabilities?: {
+			configurable?: boolean;
+			watchable?: boolean;
+			multiple_mounts?: boolean;
+			source?: string;
+		};
+		homepage_url?: string;
+		import?: {
+			id: string;
+			minimum_version?: string
+		}[];
+		export?: {
+			whitelist?: string[]
+		};
+		incognito?: string;
+		input_components?: {
+			name?: string;
+			type?: string;
+			id?: string;
+			description?: string;
+			language?: string;
+			layouts?: any[];
+		}[];
+		key?: string;
+		minimum_chrome_version?: string;
+		nacl_modules?: {
+			path: string;
+			mime_type: string;
+		}[];
+		oauth2?: {
+			client_id: string;
+			scopes?: string[];
+		};
+		offline_enabled?: boolean;
+		omnibox?: {
+			keyword: string;
+		};
+		optional_permissions?: string[];
+		options_page?: string;
+		options_ui?: {
+			page?: string;
+			chrome_style?: boolean;
+			open_in_tab?: boolean;
+		};
+		permissions?: string[];
+		platforms?: {
+			nacl_arch?: string;
+			sub_package_path: string;
+		}[];
+		plugins?: {
+			path: string;
+		}[];
+		requirements?: {
+			'3D'?: {
+				features?: string[]
+			};
+			plugins?: {
+				npapi?: boolean;
+			}
+		};
+		sandbox?: {
+			pages: string[];
+			content_security_policy?: string;
+		};
+		short_name?: string;
+		signature?: any;
+		spellcheck?: {
+			dictionary_language?: string;
+			dictionary_locale?: string;
+			dictionary_format?: string;
+			dictionary_path?: string;
+		};
+		storage?: {
+			managed_schema: string
+		};
+		system_indicator?: any;
+		tts_engine?: {
+			voices: {
+				voice_name: string;
+				lang?: string;
+				gender?: string;
+				event_types?: string[];
+			}[]
+		};
+		update_url?: string;
+		version_name?: string;
+		web_accessible_resources?: string[];
+		[key: string]: any;
+	}
 
     /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
      * @since Chrome 26.
      */
     export function connect(connectInfo?: ConnectInfo): Port;
 	/**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
      * @since Chrome 26.
      * @param extensionId Optional.
-     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging. 
+     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
      */
     export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
     /**
-     * Connects to a native application in the host machine. 
+     * Connects to a native application in the host machine.
      * @since Chrome 28.
-     * @param application The name of the registered application to connect to. 
+     * @param application The name of the registered application to connect to.
      */
     export function connectNative(application: string): Port;
     /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
     export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
     /**
-     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file. 
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
      * @returns The manifest details.
      */
-    export function getManifest(): Object;
+    export function getManifest(): Manifest;
     /**
-     * Returns a DirectoryEntry for the package directory. 
+     * Returns a DirectoryEntry for the package directory.
      * @since Chrome 29.
      */
 	export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
     /**
-     * Returns information about the current platform. 
+     * Returns information about the current platform.
      * @since Chrome 29.
-     * @param callback Called with results  
+     * @param callback Called with results
      */
     export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
     /**
-     * Converts a relative path within an app/extension install directory to a fully-qualified URL. 
-     * @param path A path to a resource within an app/extension expressed relative to its install directory. 
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
      */
     export function getURL(path: string): string;
     /**
-     * Reloads the app or extension. 
+     * Reloads the app or extension.
      * @since Chrome 25.
      */
     export function reload(): void;
     /**
-     * Requests an update check for this app/extension. 
+     * Requests an update check for this app/extension.
      * @since Chrome 25.
      * @param callback
-     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available" 
-     * Optional parameter details: If an update is available, this contains more information about the available update. 
+     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+     * Optional parameter details: If an update is available, this contains more information about the available update.
      */
     export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
     /**
-     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op. 
+     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
      * @since Chrome 32.
      */
     export function restart(): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 26.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 32.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 26.
      * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
     /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 32.
      * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
     /**
-     * Send a single message to a native application. 
+     * Send a single message to a native application.
      * @since Chrome 28.
      * @param application The of the native messaging host.
-     * @param message The message that will be passed to the native messaging host. 
+     * @param message The message that will be passed to the native messaging host.
      * @param responseCallback Optional.
-     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
 	export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
     /**
-     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters. 
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
      * @since Chrome 41.
      * @param url Since Chrome 34.
-     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation. 
-     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set. 
+     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
      */
 	export function setUninstallURL(url: string, callback?: () => void): void;
     /**
@@ -5699,19 +5304,19 @@ declare module chrome.runtime {
     export function openOptionsPage(callback?: () => void): void;
 
 	/**
-	 * Fired when a connection is made from either an extension process or a content script. 
+	 * Fired when a connection is made from either an extension process or a content script.
 	 * @since Chrome 26.
 	 */
     var onConnect: ExtensionConnectEvent;
 	/**
-	 * Fired when a connection is made from another extension. 
+	 * Fired when a connection is made from another extension.
 	 * @since Chrome 26.
 	 */
-	var onConnectExternal: RuntimeEvent;
+	var onConnectExternal: ExtensionConnectEvent;
 	/** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
 	var onSuspend: RuntimeEvent;
 	/**
-	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode. 
+	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
 	 * @since Chrome 23.
 	 */
 	var onStartup: RuntimeEvent;
@@ -5720,28 +5325,28 @@ declare module chrome.runtime {
 	/** Sent after onSuspend to indicate that the app won't be unloaded after all. */
 	var onSuspendCanceled: RuntimeEvent;
 	/**
-	 * Fired when a message is sent from either an extension process or a content script. 
+	 * Fired when a message is sent from either an extension process or a content script.
 	 * @since Chrome 26.
 	 */
     var onMessage: ExtensionMessageEvent;
 	/**
-	 * Fired when a message is sent from another extension/app. Cannot be used in a content script. 
+	 * Fired when a message is sent from another extension/app. Cannot be used in a content script.
 	 * @since Chrome 26.
 	 */
 	var onMessageExternal: ExtensionMessageEvent;
 	/**
-	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps. 
+	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
 	 * @since Chrome 29.
 	 */
     var onRestartRequired: RuntimeRestartRequiredEvent;
 	/**
-	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event. 
+	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
 	 * @since Chrome 25.
 	 */
     var onUpdateAvailable: RuntimeUpdateAvailableEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required. 
+	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
 	 */
 	var onBrowserUpdateAvailable: RuntimeEvent;
 }
@@ -5749,7 +5354,7 @@ declare module chrome.runtime {
 ////////////////////
 // Script Badge
 ////////////////////
-declare module chrome.scriptBadge {
+declare namespace chrome.scriptBadge {
     interface GetPopupDetails {
         tabId: number;
     }
@@ -5763,9 +5368,7 @@ declare module chrome.scriptBadge {
         popup: string;
     }
 
-    interface ScriptBadgeClickedEvent extends chrome.events.Event {
-        addListener(callback: (tab: chrome.tabs.Tab) => void): void;
-    }
+    interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
     export function getPopup(details: GetPopupDetails, callback: Function): void;
     export function getAttention(details: AttentionDetails): void;
@@ -5778,15 +5381,15 @@ declare module chrome.scriptBadge {
 // Sessions
 ////////////////////
 /**
- * Use the chrome.sessions API to query and restore tabs and windows from a browsing session. 
- * Permissions:  "sessions"   
+ * Use the chrome.sessions API to query and restore tabs and windows from a browsing session.
+ * Permissions:  "sessions"
  * @since Chrome 37.
  */
-declare module chrome.sessions {
+declare namespace chrome.sessions {
 	interface Filter {
 		/**
 		 * Optional.
-		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS). 
+		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS).
 		 */
 		maxResults?: number;
 	}
@@ -5796,12 +5399,12 @@ declare module chrome.sessions {
 		lastModified: number;
 		/**
 		 * Optional.
-		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set. 
+		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set.
 		 */
 		tab?: tabs.Tab;
 		/**
 		 * Optional.
-		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set. 
+		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set.
 		 */
 		window?: windows.Window;
 	}
@@ -5813,46 +5416,44 @@ declare module chrome.sessions {
 		sessions: Session[];
 	}
 
-	interface SessionChangedEvent extends chrome.events.Event {
-		addListener(callback: () => void): void;
-	}
-	
+	interface SessionChangedEvent extends chrome.events.Event<() => void> {}
+
 	/** The maximum number of sessions.Session that will be included in a requested list. */
 	export var MAX_SESSION_RESULTS: number;
-	
+
 	/**
-	 * Gets the list of recently closed tabs and/or windows. 
-	 * @param callback 
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows. 
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
 	 */
 	export function getRecentlyClosed(filter: Filter, callback: (sessions: Session[]) => void): void;
 	/**
-	 * Gets the list of recently closed tabs and/or windows. 
-	 * @param callback 
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows. 
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
 	 */
 	export function getRecentlyClosed(callback: (sessions: Session[]) => void): void;
 	/**
-	 * Retrieves all devices with synced sessions. 
-	 * @param callback 
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects. 
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
 	 */
 	export function getDevices(filter: Filter, callback: (devices: Device[]) => void): void;
 	/**
-	 * Retrieves all devices with synced sessions. 
-	 * @param callback 
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects. 
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
 	 */
 	export function getDevices(callback: (devices: Device[]) => void): void;
 	/**
-	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored. 
+	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored.
 	 * @param sessionId Optional.
-	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored. 
+	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored.
 	 * @param callback Optional.
-	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object. 
+	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object.
 	 */
 	export function restore(sessionId?: string, callback?: (restoredSession: Session) => void): void;
-	
+
 	/** Fired when recently closed tabs and/or windows are changed. This event does not monitor synced sessions changes. */
 	export var onChanged: SessionChangedEvent;
 }
@@ -5861,85 +5462,85 @@ declare module chrome.sessions {
 // Storage
 ////////////////////
 /**
- * Use the chrome.storage API to store, retrieve, and track changes to user data. 
- * Permissions:  "storage"   
+ * Use the chrome.storage API to store, retrieve, and track changes to user data.
+ * Permissions:  "storage"
  * @since Chrome 20.
  */
-declare module chrome.storage {
+declare namespace chrome.storage {
 	interface StorageArea {
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(callback: (bytesInUse: number) => void): void;
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(key: string, callback: (bytesInUse: number) => void): void;
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
 		/**
-		 * Removes all items from storage. 
+		 * Removes all items from storage.
 		 * @param callback Optional.
 		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		clear(callback?: () => void): void;
 		/**
-		 * Sets multiple items. 
+		 * Sets multiple items.
 		 * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
 		 * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		set(items: Object, callback?: () => void): void;
 		/**
 		 * Removes one item from storage.
 		 * @param key A single key for items to remove.
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		remove(key: string, callback?: () => void): void;
 		/**
 		 * Removes items from storage.
 		 * @param keys A list of keys for items to remove.
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		remove(keys: string[], callback?: () => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param key A single key to get. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param key A single key to get. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(key: string, callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(keys: string[], callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(keys: Object, callback: (items: { [key: string]: any }) => void): void;
 	}
@@ -5978,14 +5579,7 @@ declare module chrome.storage {
 		MAX_WRITE_OPERATIONS_PER_MINUTE: number;
 	}
 
-	interface StorageChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter changes: Object mapping each key that changed to its corresponding storage.StorageChange for that item. 
-		 * Parameter areaName: Since Chrome 22. The name of the storage area ("sync", "local" or "managed") the changes are for.
-		 */
-		addListener(callback: (changes: { [key: string]: StorageChange }, areaName: string) => void): void;
-	}
+	interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
 
 	/** Items in the local storage area are local to each machine. */
 	var local: LocalStorageArea;
@@ -5993,7 +5587,7 @@ declare module chrome.storage {
 	var sync: SyncStorageArea;
 
 	/**
-	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error. 
+	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
 	 * @since Chrome 33.
 	 */
 	var managed: StorageArea;
@@ -6005,7 +5599,7 @@ declare module chrome.storage {
 ////////////////////
 // Socket
 ////////////////////
-declare module chrome.socket {
+declare namespace chrome.socket {
     interface CreateInfo {
         socketId: number;
     }
@@ -6067,10 +5661,10 @@ declare module chrome.socket {
 ////////////////////
 /**
  * Use the system.cpu API to query CPU metadata.
- * Permissions: "system.cpu"    
+ * Permissions: "system.cpu"
  * @since Chrome 32.
  */
-declare module chrome.system.cpu {
+declare namespace chrome.system.cpu {
 	interface ProcessorUsage {
 		/** The cumulative time used by userspace programs on this processor. */
 		user: number;
@@ -6094,15 +5688,15 @@ declare module chrome.system.cpu {
 		archName: string;
 		/** The model name of the processors. */
 		modelName: string;
-		/** 
-		 * A set of feature codes indicating some of the processor's capabilities. 
-		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx". 
+		/**
+		 * A set of feature codes indicating some of the processor's capabilities.
+		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
 		 */
 		features: string[];
 		/** Information about each logical processor. */
 		processors: ProcessorInfo[];
 	}
-	
+
 	/** Queries basic CPU information of the system. */
 	export function getInfo(callback: (info: CpuInfo) => void): void;
 }
@@ -6111,18 +5705,18 @@ declare module chrome.system.cpu {
 // System Memory
 ////////////////////
 /**
- * The chrome.system.memory API. 
- * Permissions:  "system.memory"   
+ * The chrome.system.memory API.
+ * Permissions:  "system.memory"
  * @since Chrome 32.
  */
-declare module chrome.system.memory {
+declare namespace chrome.system.memory {
 	interface MemoryInfo {
 		/** The total amount of physical memory capacity, in bytes. */
 		capacity: number;
 		/** The amount of available capacity, in bytes. */
 		availableCapacity: number;
 	}
-	
+
 	/** Get physical memory information. */
 	export function getInfo(callback: (info: MemoryInfo) => void): void;
 }
@@ -6131,21 +5725,21 @@ declare module chrome.system.memory {
 // System Storage
 ////////////////////
 /**
- * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached. 
- * Permissions:  "system.storage"   
+ * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+ * Permissions:  "system.storage"
  * @since Chrome 30.
  */
-declare module chrome.system.storage {
+declare namespace chrome.system.storage {
 	interface StorageUnitInfo {
 		/** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
 		id: string;
 		/** The name of the storage unit. */
 		name: string;
-		/** 
+		/**
 		 * The media type of the storage unit.
-		 * fixed: The storage has fixed media, e.g. hard disk or SSD. 
-		 * removable: The storage is removable, e.g. USB flash drive. 
-		 * unknown: The storage type is unknown. 
+		 * fixed: The storage has fixed media, e.g. hard disk or SSD.
+		 * removable: The storage is removable, e.g. USB flash drive.
+		 * unknown: The storage type is unknown.
 		 */
 		type: string;
 		/** The total amount of the storage space, in bytes. */
@@ -6159,28 +5753,24 @@ declare module chrome.system.storage {
 		availableCapacity: number;
 	}
 
-	interface SystemStorageAttachedEvent extends chrome.events.Event {
-		addListener(callback: (info: StorageUnitInfo) => void): void;
-	}
+	interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
+
+	interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
 
-	interface SystemStorageDetachedEvent extends chrome.events.Event {
-		addListener(callback: (id: string) => void): void;
-	}
-	
 	/** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
 	export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
 	/**
-	 * Ejects a removable storage device. 
+	 * Ejects a removable storage device.
 	 * @param callback
-	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed. 
+	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
 	 */
 	export function ejectDevice(id: string, callback: (result: string) => void): void;
 	/**
-	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo. 
+	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
 	 * @since Dev channel only.
 	 */
 	export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
-	
+
 	/** Fired when a new removable storage is attached to the system. */
 	export var onAttached: SystemStorageAttachedEvent;
 	/** Fired when a removable storage is detached from the system. */
@@ -6191,16 +5781,16 @@ declare module chrome.system.storage {
 // TabCapture
 ////////////////////
 /**
- * Use the chrome.tabCapture API to interact with tab media streams. 
- * Permissions:  "tabCapture"   
+ * Use the chrome.tabCapture API to interact with tab media streams.
+ * Permissions:  "tabCapture"
  * @since Chrome 31.
  */
-declare module chrome.tabCapture {
+declare namespace chrome.tabCapture {
     interface CaptureInfo {
 		/** The id of the tab whose status changed. */
         tabId: number;
 		/**
-		 * The new capture status of the tab. 
+		 * The new capture status of the tab.
 		 * One of: "pending", "active", "stopped", or "error"
 		 */
         status: string;
@@ -6219,26 +5809,20 @@ declare module chrome.tabCapture {
 		videoConstraints?: MediaStreamConstraints;
 	}
 
-	interface CaptureStatusChangedEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter info: CaptureInfo with new capture status for the tab. 
-		 */
-		addListener(callback: (info: CaptureInfo) => void): void;
-    }
+	interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
 
 	/**
-	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension. 
-	 * @param options Configures the returned media stream.  
-	 * @param callback Callback with either the tab capture stream or null. 
+	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
+	 * @param options Configures the returned media stream.
+	 * @param callback Callback with either the tab capture stream or null.
 	 */
     export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
 	/**
-	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab). 
-	 * @param callback Callback invoked with CaptureInfo[] for captured tabs. 
+	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab).
+	 * @param callback Callback invoked with CaptureInfo[] for captured tabs.
 	 */
     export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
-	
+
 	/** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
 	var onStatusChanged: CaptureStatusChangedEvent;
 }
@@ -6247,11 +5831,11 @@ declare module chrome.tabCapture {
 // Tabs
 ////////////////////
 /**
- * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser. 
+ * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser.
  * Permissions: The majority of the chrome.tabs API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab.
- * @since Chrome 5.  
+ * @since Chrome 5.
  */
-declare module chrome.tabs {
+declare namespace chrome.tabs {
 	/**
 	 * Tab muted state and the reason for the last state change.
 	 * @since Chrome 46. Warning: this is the current Beta channel.
@@ -6262,14 +5846,14 @@ declare module chrome.tabs {
 		/**
 		 * Optional.
 		 * The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
-		 * "user": A user input action has set/overridden the muted state. 
-		 * "capture": Tab capture started, forcing a muted state change. 
-		 * "extension": An extension, identified by the extensionId field, set the muted state. 
+		 * "user": A user input action has set/overridden the muted state.
+		 * "capture": Tab capture started, forcing a muted state change.
+		 * "extension": An extension, identified by the extensionId field, set the muted state.
 		 */
 		reason?: string;
 		/**
 		 * Optional.
-		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed. 
+		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
 		 */
 		extensionId?: string;
 	}
@@ -6277,85 +5861,85 @@ declare module chrome.tabs {
     interface Tab {
 		/**
 		 * Optional.
-		 * Either loading or complete. 
+		 * Either loading or complete.
 		 */
         status?: string;
 		/** The zero-based index of the tab within its window. */
         index: number;
 		/**
 		 * Optional.
-		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists. 
+		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/**
 		 * Optional.
-		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission. 
+		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
 		 */
         title?: string;
 		/**
 		 * Optional.
-		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission. 
+		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
 		 */
         url?: string;
 		/**
-		 * Whether the tab is pinned. 
+		 * Whether the tab is pinned.
 		 * @since Chrome 9.
 		 */
         pinned: boolean;
 		/**
-		 * Whether the tab is highlighted. 
+		 * Whether the tab is highlighted.
 		 * @since Chrome 16.
 		 */
         highlighted: boolean;
 		/** The ID of the window the tab is contained within. */
         windowId: number;
 		/**
-		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.) 
+		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.)
 		 * @since Chrome 16.
 		 */
         active: boolean;
 		/**
 		 * Optional.
-		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading. 
+		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
 		 */
         favIconUrl?: string;
 		/**
 		 * Optional.
-		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows. 
+		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
 		 */
 		id?: number;
 		/** Whether the tab is in an incognito window. */
         incognito: boolean;
 		/**
-		 * Whether the tab is selected. 
-		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted. 
+		 * Whether the tab is selected.
+		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted.
 		 */
 		selected: boolean;
 		/**
 		 * Optional.
-		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing. 
+		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
 		 * Optional.
-		 * Current tab muted state and the reason for the last state change. 
+		 * Current tab muted state and the reason for the last state change.
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		mutedInfo?: MutedInfo;
 		/**
-		 * Optional. The width of the tab in pixels. 
+		 * Optional. The width of the tab in pixels.
 		 * @since Chrome 31.
 		 */
 		width?: number;
 		/**
-		 * Optional. The height of the tab in pixels. 
+		 * Optional. The height of the tab in pixels.
 		 * @since Chrome 31.
 		 */
 		height?: number;
 		/**
-		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API. 
+		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API.
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
@@ -6368,22 +5952,22 @@ declare module chrome.tabs {
 	interface ZoomSettings {
 		/**
 		 * Optional.
-		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic". 
-		 * "automatic": Zoom changes are handled automatically by the browser. 
-		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab. 
-		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored. 
+		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic".
+		 * "automatic": Zoom changes are handled automatically by the browser.
+		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab.
+		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored.
 		 */
 		mode?: string;
 		/**
 		 * Optional.
-		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise. 
-		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode. 
-		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors. 
+		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise.
+		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode.
+		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors.
 		 */
 		scope?: string;
 		/**
 		 * Optional.
-		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings. 
+		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings.
 		 * @since Chrome 43.
 		 */
 		defaultZoomFactor?: number;
@@ -6392,16 +5976,16 @@ declare module chrome.tabs {
     interface InjectDetails {
 		/**
 		 * Optional.
-		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. 
+		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame.
 		 */
         allFrames?: boolean;
 		/**
 		 * Optional. JavaScript or CSS code to inject.
-		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks. 
+		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
 		 */
         code?: string;
 		/**
-		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab. 
+		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab.
 		 * One of: "document_start", "document_end", or "document_idle"
 		 * @since Chrome 20.
 		 */
@@ -6411,7 +5995,7 @@ declare module chrome.tabs {
 		/**
 		 * Optional.
 		 * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-		 * @since Chrome 39. 
+		 * @since Chrome 39.
 		 */
 		matchAboutBlank?: boolean;
     }
@@ -6421,17 +6005,17 @@ declare module chrome.tabs {
         index?: number;
 		/**
 		 * Optional.
-		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab. 
+		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/**
 		 * Optional.
-		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
+		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
 		 */
         url?: string;
 		/**
-		 * Optional. Whether the tab should be pinned. Defaults to false 
+		 * Optional. Whether the tab should be pinned. Defaults to false
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
@@ -6439,13 +6023,13 @@ declare module chrome.tabs {
         windowId?: number;
 		/**
 		 * Optional.
-		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true. 
+		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true.
 		 * @since Chrome 16.
 		 */
         active?: boolean;
 		/**
 		 * Optional. Whether the tab should become the selected tab in the window. Defaults to true
-		 * @deprecated since Chrome 33. Please use active.  
+		 * @deprecated since Chrome 33. Please use active.
 		 */
 		selected?: boolean;
     }
@@ -6458,35 +6042,35 @@ declare module chrome.tabs {
     }
 
     interface UpdateProperties {
-		/** 
-		 * Optional. Whether the tab should be pinned. 
+		/**
+		 * Optional. Whether the tab should be pinned.
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
 		/**
-		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab. 
+		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/** Optional. A URL to navigate the tab to. */
         url?: string;
 		/**
-		 * Optional. Adds or removes the tab from the current selection. 
+		 * Optional. Adds or removes the tab from the current selection.
 		 * @since Chrome 16.
 		 */
         highlighted?: boolean;
 		/**
-		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update). 
+		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update).
 		 * @since Chrome 16.
 		 */
         active?: boolean;
 		/**
-		 * Optional. Whether the tab should be selected. 
-		 * @deprecated since Chrome 33. Please use highlighted. 
+		 * Optional. Whether the tab should be selected.
+		 * @deprecated since Chrome 33. Please use highlighted.
 		 */
 		selected?: boolean;
 		/**
-		 * Optional. Whether the tab should be muted. 
+		 * Optional. Whether the tab should be muted.
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
@@ -6495,11 +6079,11 @@ declare module chrome.tabs {
     interface CaptureVisibleTabOptions {
 		/**
 		 * Optional.
-		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease. 
+		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
 		 */
         quality?: number;
 		/**
-		 * Optional. The format of an image. 
+		 * Optional. The format of an image.
 		 * One of: "jpeg", or "png"
 		 */
         format?: string;
@@ -6514,7 +6098,7 @@ declare module chrome.tabs {
 		/** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
         name?: string;
 		/**
-		 * Open a port to a specific frame identified by frameId instead of all frames in the tab. 
+		 * Open a port to a specific frame identified by frameId instead of all frames in the tab.
 		 * @since Chrome 41.
 		 */
 		frameId?: number;
@@ -6535,25 +6119,25 @@ declare module chrome.tabs {
     interface QueryInfo {
 		/**
 		 * Optional. Whether the tabs have completed loading.
-		 * One of: "loading", or "complete"  
+		 * One of: "loading", or "complete"
 		 */
         status?: string;
 		/**
-		 * Optional. Whether the tabs are in the last focused window. 
+		 * Optional. Whether the tabs are in the last focused window.
 		 * @since Chrome 19.
 		 */
         lastFocusedWindow?: boolean;
 		/** Optional. The ID of the parent window, or windows.WINDOW_ID_CURRENT for the current window. */
         windowId?: number;
 		/**
-		 * Optional. The type of window the tabs are in. 
-		 * One of: "normal", "popup", "panel", "app", or "devtools" 
+		 * Optional. The type of window the tabs are in.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
 		 */
         windowType?: string;
 		/** Optional. Whether the tabs are active in their windows. */
         active?: boolean;
 		/**
-		 * Optional. The position of the tabs within their windows. 
+		 * Optional. The position of the tabs within their windows.
 		 * @since Chrome 18.
 		 */
         index?: number;
@@ -6562,7 +6146,7 @@ declare module chrome.tabs {
 		/** Optional. Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
         url?: string | string[];
 		/**
-		 * Optional. Whether the tabs are in the current window. 
+		 * Optional. Whether the tabs are in the current window.
 		 * @since Chrome 19.
 		 */
         currentWindow?: boolean;
@@ -6571,12 +6155,12 @@ declare module chrome.tabs {
 		/** Optional. Whether the tabs are pinned. */
         pinned?: boolean;
 		/**
-		 * Optional. Whether the tabs are audible. 
+		 * Optional. Whether the tabs are audible.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
-		 * Optional. Whether the tabs are muted. 
+		 * Optional. Whether the tabs are muted.
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
@@ -6589,7 +6173,7 @@ declare module chrome.tabs {
 
     interface TabRemoveInfo {
 		/**
-		 * The window whose tab is closed. 
+		 * The window whose tab is closed.
 		 * @since Chrome 25.
 		 */
         windowId: number;
@@ -6606,27 +6190,32 @@ declare module chrome.tabs {
 		/** Optional. The status of the tab. Can be either loading or complete. */
         status?: string;
 		/**
-		 * The tab's new pinned state. 
+		 * The tab's new pinned state.
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
 		/** Optional. The tab's URL if it has changed. */
         url?: string;
 		/**
-		 * The tab's new audible state. 
+		 * The tab's new audible state.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
-		 * The tab's new muted state and the reason for the change. 
+		 * The tab's new muted state and the reason for the change.
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		mutedInfo?: MutedInfo;
 		/**
-		 * The tab's new favicon URL. 
+		 * The tab's new favicon URL.
 		 * @since Chrome 27.
 		 */
-		faviconUrl?: string;
+		favIconUrl?: string;
+		/**
+		 * The tab's new title.
+		 * @since Chrome 48.
+		 */
+		title?: string;
     }
 
     interface TabMoveInfo {
@@ -6659,175 +6248,144 @@ declare module chrome.tabs {
 		zoomSettings: ZoomSettings;
 	}
 
-    interface TabHighlightedEvent extends chrome.events.Event {
-        addListener(callback: (highlightInfo: HighlightInfo) => void): void;
-    }
+    interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
 
-    interface TabRemovedEvent extends chrome.events.Event {
-        addListener(callback: (tabId: number, removeInfo: TabRemoveInfo) => void): void;
-    }
+    interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
 
-    interface TabUpdatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter changeInfo: Lists the changes to the state of the tab that was updated. 
-		 * Parameter tab: Gives the state of the tab that was updated. 
-		 */
-        addListener(callback: (tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void): void;
-    }
+    interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
 
-    interface TabAttachedEvent extends chrome.events.Event {
-        addListener(callback: (tabId: number, attachInfo: TabAttachInfo) => void): void;
-    }
+    interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
 
-    interface TabMovedEvent extends chrome.events.Event {
-        addListener(callback: (tabId: number, moveInfo: TabMoveInfo) => void): void;
-    }
+    interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
 
-    interface TabDetachedEvent extends chrome.events.Event {
-        addListener(callback: (tabId: number, detachInfo: TabDetachInfo) => void): void;
-    }
+    interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
 
-    interface TabCreatedEvent extends chrome.events.Event {
-		/**
-		 * @param callback 
-		 * Parameter tab: Details of the tab that was created. 
-		 */
-        addListener(callback: (tab: Tab) => void): void;
-    }
+    interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
 
-    interface TabActivatedEvent extends chrome.events.Event {
-        addListener(callback: (activeInfo: TabActiveInfo) => void): void;
-    }
+    interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
 
-    interface TabReplacedEvent extends chrome.events.Event {
-        addListener(callback: (addedTabId: number, removedTabId: number) => void): void;
-    }
+    interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
 
-	interface TabSelectedEvent extends chrome.events.Event {
-		addListener(callback: (tabId: number, selectInfo: TabWindowInfo) => void): void;
-	}
+	interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
 
-	interface TabZoomChangeEvent extends chrome.events.Event {
-		addListener(callback: (ZoomChangeInfo: ZoomChangeInfo) => void): void;
-	}
+	interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
 
 	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
 	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.  
+	 * Parameter result: The result of the script in every injected frame.
 	 */
     export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
 	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc. 
-	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
 	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.  
+	 * Parameter result: The result of the script in every injected frame.
 	 */
     export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
 	/** Retrieves details about the specified tab. */
     export function get(tabId: number, callback: (tab: Tab) => void): void;
 	/**
-	 * Gets details about all tabs in the specified window. 
+	 * Gets details about all tabs in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
 	 */
 	export function getAllInWindow(callback: (tab: Tab) => void): void;
 	/**
-	 * Gets details about all tabs in the specified window. 
+	 * Gets details about all tabs in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
-	 * @param windowId Optional. Defaults to the current window. 
+	 * @param windowId Optional. Defaults to the current window.
 	 */
 	export function getAllInWindow(windowId: number, callback: (tab: Tab) => void): void;
 	/** Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for example: a background page or popup view). */
     export function getCurrent(callback: (tab?: Tab) => void): void;
 	/**
-	 * Gets the tab that is selected in the specified window. 
+	 * Gets the tab that is selected in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
 	 */
 	export function getSelected(callback: (tab: Tab) => void): void;
 	/**
-	 * Gets the tab that is selected in the specified window. 
+	 * Gets the tab that is selected in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
-	 * @param windowId Optional. Defaults to the current window. 
+	 * @param windowId Optional. Defaults to the current window.
 	 */
 	export function getSelected(windowId: number, callback: (tab: Tab) => void): void;
 	/**
-	 * Creates a new tab. 
+	 * Creates a new tab.
 	 * @param callback Optional.
-	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab. 
+	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab.
 	 */
     export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
 	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
 	 * @param tabId The tab to move.
 	 * @param callback Optional.
 	 * Parameter tab: Details about the moved tab.
 	 */
     export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
 	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
 	 * @param tabIds The tabs to move.
 	 * @param callback Optional.
 	 * Parameter tabs: Details about the moved tabs.
 	 */
     export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
 	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
-	 * @param tabId Defaults to the selected tab of the current window. 
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
+	 * @param tabId Defaults to the selected tab of the current window.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Closes a tab.
-	 * @param tabId The tab to close. 
+	 * @param tabId The tab to close.
 	 */
     export function remove(tabId: number, callback?: Function): void;
 	/**
 	 * Closes several tabs.
-	 * @param tabIds The list of tabs to close. 
+	 * @param tabIds The list of tabs to close.
 	 */
     export function remove(tabIds: number[], callback?: Function): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
 	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
-	 * @param options Optional. Details about the format and quality of an image. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
 	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param options Optional. Details about the format and quality of an image. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
 	 * Reload a tab.
 	 * @since Chrome 16.
-	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window. 
+	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window.
 	 */
 	export function reload(tabId: number, reloadProperties?: ReloadProperties, callback?: () => void): void;
 	/**
@@ -6841,28 +6399,28 @@ declare module chrome.tabs {
 	 */
 	export function reload(callback?: () => void): void;
 	/**
-	 * Duplicates a tab. 
+	 * Duplicates a tab.
 	 * @since Chrome 23.
-	 * @param tabId The ID of the tab which is to be duplicated. 
+	 * @param tabId The ID of the tab which is to be duplicated.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 20. 
+	 * @since Chrome 20.
 	 */
     export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 41. 
+	 * @since Chrome 41.
 	 * @param responseCallback Optional.
-	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendMessage(tabId: number, message: any, options: MessageSendOptions, responseCallback?: (response: any) => void): void;
 	/**
-	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension. 
-	 * @deprecated since Chrome 33. Please use runtime.sendMessage.  
+	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension.
+	 * @deprecated since Chrome 33. Please use runtime.sendMessage.
 	 * @param responseCallback Optional.
 	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
@@ -6871,105 +6429,105 @@ declare module chrome.tabs {
     export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
 	/**
 	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
-	 * @param callback Optional. Called when all the CSS has been inserted.  
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
 	 */
 	export function insertCSS(details: InjectDetails, callback?: Function): void;
 	/**
 	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
-	 * @param callback Optional. Called when all the CSS has been inserted.  
+	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
 	 */
     export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
 	/**
-	 * Highlights the given tabs. 
+	 * Highlights the given tabs.
 	 * @since Chrome 16.
 	 * @param callback Optional.
-	 * Parameter window: Contains details about the window whose tabs were highlighted. 
+	 * Parameter window: Contains details about the window whose tabs were highlighted.
 	 */
     export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified. 
+	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified.
 	 * @since Chrome 16.
 	 */
     export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
 	/**
-	 * Detects the primary language of the content in a tab. 
-	 * @param callback 
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
+	 * Detects the primary language of the content in a tab.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
 	 */
     export function detectLanguage(callback: (language: string) => void): void;
 	/**
 	 * Detects the primary language of the content in a tab.
-	 * @param tabId Optional. Defaults to the active tab of the current window.  
-	 * @param callback 
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
+	 * @param tabId Optional. Defaults to the active tab of the current window.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
 	 */
     export function detectLanguage(tabId: number, callback: (language: string) => void): void;
 	/**
 	 * Zooms a specified tab.
 	 * @since Chrome 42.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab. 
-	 * @param callback Optional. Called after the zoom factor has been changed. 
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
 	 */
 	export function setZoom(zoomFactor: number, callback?: () => void): void;
 	/**
 	 * Zooms a specified tab.
 	 * @since Chrome 42.
 	 * @param tabId Optional. The ID of the tab to zoom; defaults to the active tab of the current window.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab. 
-	 * @param callback Optional. Called after the zoom factor has been changed. 
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
 	 */
 	export function setZoom(tabId: number, zoomFactor: number, callback?: () => void): void;
 	/**
-	 * Gets the current zoom factor of a specified tab. 
+	 * Gets the current zoom factor of a specified tab.
 	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom factor after it has been fetched. 
-	 * Parameter zoomFactor: The tab's current zoom factor. 
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
 	 */
 	export function getZoom(callback: (zoomFactor: number) => void): void;
 	/**
-	 * Gets the current zoom factor of a specified tab. 
+	 * Gets the current zoom factor of a specified tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window. 
-	 * @param callback Called with the tab's current zoom factor after it has been fetched. 
-	 * Parameter zoomFactor: The tab's current zoom factor. 
+	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
 	 */
 	export function getZoom(tabId: number, callback: (zoomFactor: number) => void): void;
 	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab. 
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
 	 * @since Chrome 42.
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope. 
-	 * @param callback Optional. Called after the zoom settings have been changed. 
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
 	 */
 	export function setZoomSettings(zoomSettings: ZoomSettings, callback?: () => void): void;
 	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab. 
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window. 
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope. 
-	 * @param callback Optional. Called after the zoom settings have been changed. 
+	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window.
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
 	 */
 	export function setZoomSettings(tabId: number, zoomSettings: ZoomSettings, callback?: () => void): void;
 	/**
-	 * Gets the current zoom settings of a specified tab. 
+	 * Gets the current zoom settings of a specified tab.
 	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom settings. 
-	 * Paramater zoomSettings: The tab's current zoom settings. 
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
 	 */
 	export function getZoomSettings(callback: (zoomSettings: ZoomSettings) => void): void;
 	/**
-	 * Gets the current zoom settings of a specified tab. 
+	 * Gets the current zoom settings of a specified tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window. 
-	 * @param callback Called with the tab's current zoom settings. 
-	 * Paramater zoomSettings: The tab's current zoom settings. 
+	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
 	 */
 	export function getZoomSettings(tabId: number, callback: (zoomSettings: ZoomSettings) => void): void;
 
 	/**
-	 * Fired when the highlighted or selected tabs in a window changes. 
+	 * Fired when the highlighted or selected tabs in a window changes.
 	 * @since Chrome 18.
 	 */
     var onHighlighted: TabHighlightedEvent;
@@ -6980,7 +6538,7 @@ declare module chrome.tabs {
 	/** Fired when a tab is attached to a window, for example because it was moved between windows. */
     var onAttached: TabAttachedEvent;
 	/**
-	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached. 
+	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached.
 	 */
     var onMoved: TabMovedEvent;
 	/** Fired when a tab is detached from a window, for example because it is being moved between windows. */
@@ -6988,32 +6546,32 @@ declare module chrome.tabs {
 	/** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
     var onCreated: TabCreatedEvent;
 	/**
-	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. 
+	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.
 	 * @since Chrome 18.
 	 */
     var onActivated: TabActivatedEvent;
 	/**
-	 * Fired when a tab is replaced with another tab due to prerendering or instant. 
+	 * Fired when a tab is replaced with another tab due to prerendering or instant.
 	 * @since Chrome 26.
 	 */
     var onReplaced: TabReplacedEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes.  
+	 * Fires when the selected tab in a window changes.
 	 */
 	var onSelectionChanged: TabSelectedEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.  
+	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.
 	 */
 	var onActiveChanged: TabSelectedEvent;
 	/**
-	 * @deprecated since Chrome 33. Please use tabs.onHighlighted. 
-	 * Fired when the highlighted or selected tabs in a window changes. 
+	 * @deprecated since Chrome 33. Please use tabs.onHighlighted.
+	 * Fired when the highlighted or selected tabs in a window changes.
 	 */
 	var onHighlightChanged: TabHighlightedEvent;
 	/**
-	 * Fired when a tab is zoomed. 
+	 * Fired when a tab is zoomed.
 	 * @since Chrome 38.
 	 */
 	var onZoomChange: TabZoomChangeEvent;
@@ -7023,11 +6581,11 @@ declare module chrome.tabs {
 // Top Sites
 ////////////////////
 /**
- * Use the chrome.topSites API to access the top sites that are displayed on the new tab page. 
- * Permissions:  "topSites"   
+ * Use the chrome.topSites API to access the top sites that are displayed on the new tab page.
+ * Permissions:  "topSites"
  * @since Chrome 19.
  */
-declare module chrome.topSites {
+declare namespace chrome.topSites {
 	/** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
     interface MostVisitedURL {
 		/** The most visited URL. */
@@ -7044,11 +6602,11 @@ declare module chrome.topSites {
 // Text to Speech
 ////////////////////
 /**
- * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine. 
- * Permissions:  "tts"   
+ * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+ * Permissions:  "tts"
  * @since Chrome 14.
  */
-declare module chrome.tts {
+declare namespace chrome.tts {
 	/** An event from the TTS engine to communicate the status of an utterance. */
     interface TtsEvent {
 		/** Optional. The index of the current character in the utterance. */
@@ -7056,7 +6614,7 @@ declare module chrome.tts {
 		/** Optional. The error description, if the event type is 'error'. */
         errorMessage?: string;
 		/**
-		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances. 
+		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
 		 * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
 		 */
         type: string;
@@ -7066,9 +6624,9 @@ declare module chrome.tts {
     interface TtsVoice {
 		/** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
-		/** 
+		/**
 		 * Optional. This voice's gender.
-		 * One of: "male", or "female" 
+		 * One of: "male", or "female"
 		 */
         gender?: string;
 		/** Optional. The name of the voice. */
@@ -7078,7 +6636,7 @@ declare module chrome.tts {
 		/** All of the callback event types that this voice is capable of sending. */
         eventTypes?: string[];
 		/**
-		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs. 
+		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
 		 * @since Chrome 33.
 		 */
 		remote?: boolean;
@@ -7089,22 +6647,22 @@ declare module chrome.tts {
         volume?: number;
 		/**
 		 * Optional.
-		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance. 
+		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
 		 */
         enqueue?: boolean;
 		/**
 		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0. 
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
 		 */
         rate?: number;
-		/** 
+		/**
 		 * Optional. This function is called with events that occur in the process of speaking the utterance.
-		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.  
+		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.
 		 */
         onEvent?: (event: TtsEvent) => void;
 		/**
 		 * Optional.
-		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch. 
+		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
 		 */
         pitch?: number;
 		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
@@ -7114,8 +6672,8 @@ declare module chrome.tts {
 		/** Optional. The extension ID of the speech engine to use, if known. */
         extensionId?: string;
 		/**
-		 * Optional. Gender of voice for synthesized speech. 
-		 * One of: "male", or "female" 
+		 * Optional. Gender of voice for synthesized speech.
+		 * One of: "male", or "female"
 		 */
         gender?: string;
 		/** Optional. The TTS event types the voice must support. */
@@ -7131,25 +6689,25 @@ declare module chrome.tts {
 	/** Gets an array of all available voices. */
     export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
 	/**
-	 * Speaks text using a text-to-speech engine. 
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters. 
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback. 
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
 	 */
 	export function speak(utterance: string, callback?: Function): void;
 	/**
-	 * Speaks text using a text-to-speech engine. 
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters. 
-	 * @param options Optional. The speech options. 
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback. 
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param options Optional. The speech options.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
 	 */
 	export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
 	/**
-	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech. 
+	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
 	 * @since Chrome 29.
 	 */
 	export function pause(): void;
 	/**
-	 * If speech was paused, resumes speaking where it left off. 
+	 * If speech was paused, resumes speaking where it left off.
 	 * @since Chrome 29.
 	 */
 	export function resume(): void;
@@ -7159,18 +6717,18 @@ declare module chrome.tts {
 // Text to Speech Engine
 ////////////////////
 /**
- * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status. 
- * Permissions:  "ttsEngine"   
+ * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status.
+ * Permissions:  "ttsEngine"
  * @since Chrome 14.
  */
-declare module chrome.ttsEngine {
+declare namespace chrome.ttsEngine {
     interface SpeakOptions {
 		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
 		/** Optional. The name of the voice to use for synthesis. */
         voiceName?: string;
 		/**
-		 * Optional. Gender of voice for synthesized speech. 
+		 * Optional. Gender of voice for synthesized speech.
 		 * One of: "male", or "female"
 		 */
         gender?: string;
@@ -7178,47 +6736,39 @@ declare module chrome.ttsEngine {
         volume?: number;
 		/**
 		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports. 
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports.
 		 */
         rate?: number;
 		/** Optional. Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to this voice's default pitch. */
         pitch?: number;
     }
 
-    interface TtsEngineSpeakEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter utterance: The text to speak, specified as either plain text or an SSML document. If your engine does not support SSML, you should strip out all XML markup and synthesize only the underlying text content. The value of this parameter is guaranteed to be no more than 32,768 characters. If this engine does not support speaking that many characters at a time, the utterance should be split into smaller chunks and queued internally without returning an error. 
-		 * Parameter options: Options specified to the tts.speak() method. 
-		 * Parameter sendTtsEvent: Call this function with events that occur in the process of speaking the utterance. 
-		 */
-        addListener(callback: (utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void): void;
-    }
+    interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
 
 	/** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
     var onSpeak: TtsEngineSpeakEvent;
 	/** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
-	var onStop: chrome.events.Event;
+	var onStop: chrome.events.Event<() => void>;
 	/**
-	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state. 
+	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state.
 	 * @since Chrome 29.
 	 */
-	var onPause: chrome.events.Event;
+	var onPause: chrome.events.Event<() => void>;
 	/**
-	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state. 
+	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state.
 	 * @since Chrome 29.
 	 */
-	var onResume: chrome.events.Event;
+	var onResume: chrome.events.Event<() => void>;
 }
 
 ////////////////////
 // Types
 ////////////////////
 /**
- * The chrome.types API contains type declarations for Chrome. 
+ * The chrome.types API contains type declarations for Chrome.
  * @since Chrome 13.
  */
-declare module chrome.types {
+declare namespace chrome.types {
     interface ChromeSettingClearDetails {
 		/**
 		 * Optional.
@@ -7233,8 +6783,8 @@ declare module chrome.types {
 
     interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
 		/**
-		 * The value of the setting. 
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type. 
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
 		 */
         value: any;
 		/**
@@ -7254,7 +6804,7 @@ declare module chrome.types {
     }
 
 	/**
-	 * @param details Details of the currently effective value. 
+	 * @param details Details of the currently effective value.
 	 */
     type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
@@ -7272,32 +6822,30 @@ declare module chrome.types {
 		/**
 		 * Optional.
 		 * Whether the effective value is specific to the incognito session.
-		 * This property will only be present if the incognito property in the details parameter of get() was true. 
+		 * This property will only be present if the incognito property in the details parameter of get() was true.
 		 */
         incognitoSpecific?: boolean;
     }
 
-    interface ChromeSettingChangedEvent extends chrome.events.Event {
-        addListener(callback: DetailsCallback): void;
-    }
+    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
 
 	/** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
     interface ChromeSetting {
 		/**
-		 * Sets the value of a setting. 
-		 * @param details Which setting to change. 
-		 * @param callback Optional. Called at the completion of the set operation. 
+		 * Sets the value of a setting.
+		 * @param details Which setting to change.
+		 * @param callback Optional. Called at the completion of the set operation.
 		 */
         set(details: ChromeSettingSetDetails, callback?: Function): void;
 		/**
-		 * Gets the value of a setting. 
-		 * @param details Which setting to consider. 
+		 * Gets the value of a setting.
+		 * @param details Which setting to consider.
 		 */
         get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
 		/**
-		 * Clears the setting, restoring any default value. 
+		 * Clears the setting, restoring any default value.
 		 * @param details Which setting to clear.
-		 * @param callback Optional. Called at the completion of the clear operation. 
+		 * @param callback Optional. Called at the completion of the clear operation.
 		 */
         clear(details: ChromeSettingClearDetails, callback?: Function): void;
 		/** Fired after the setting changes. */
@@ -7309,12 +6857,12 @@ declare module chrome.types {
 // VPN Provider
 ////////////////////
 /**
- * Use the chrome.vpnProvider API to implement a VPN client. 
- * Permissions:  "vpnProvider"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.vpnProvider API to implement a VPN client.
+ * Permissions:  "vpnProvider"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
-declare module chrome.vpnProvider {
+declare namespace chrome.vpnProvider {
 	interface VpnSessionParameters {
 		/** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
 		address: string;
@@ -7323,11 +6871,11 @@ declare module chrome.vpnProvider {
 		/** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
 		mtu?: string;
 		/**
-		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined. 
+		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
 		 */
 		exclusionList: string[];
 		/**
-		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined. 
+		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
 		 */
 		inclusionList: string[];
 		/** Optional. A list of search domains. (default: no search domain) */
@@ -7336,90 +6884,50 @@ declare module chrome.vpnProvider {
 		dnsServer: string[];
 	}
 
-	interface VpnPlatformMessageEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter id: ID of the configuration the message is intended for. 
-		 * Parameter message: The message received from the platform. 
-		 * * connected: VPN configuration connected. 
-		 * * disconnected: VPN configuration disconnected. 
-		 * * error: An error occurred in VPN connection, for example a timeout. A description of the error is give as the  error argument to onPlatformMessage. 
-		 * Parameter error: Error message when there is an error. 
-		 */
-		addListener(callback: (id: string, message: string, error: string) => void): void;
-	}
+	interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
 
-	interface VpnPacketReceptionEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter data: The IP packet received from the platform. 
-		 */
-		addListener(callback: (data: ArrayBuffer) => void): void;
-	}
+	interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
 
-	interface VpnConfigRemovalEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter id: ID of the removed configuration. 
-		 */
-		addListener(callback: (id: string) => void): void;
-	}
+	interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
 
-	interface VpnConfigCreationEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter id: ID of the configuration created. 
-		 * Parameter name: Name of the configuration created. 
-		 * Parameter data: Configuration data provided by the administrator. 
-		 */
-		addListener(callback: (id: string, name: string, data: Object) => void): void;
-	}
+	interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
+
+	interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
 
-	interface VpnUiEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter event: The UI event that is triggered. 
-		 * * showAddDialog: Request the VPN client to show add configuration dialog to the user. 
-		 * * showConfigureDialog: Request the VPN client to show configuration settings dialog to the user.
-		 * Optional parameter id: ID of the configuration for which the UI event was triggered.  
-		 */
-		addListener(callback: (event: string, id?: string) => void): void;
-	}
-	
 	/**
-	 * Creates a new VPN configuration that persists across multiple login sessions of the user. 
-	 * @param name The name of the VPN configuration. 
-	 * @param callback Called when the configuration is created or if there is an error. 
-	 * Parameter id: A unique ID for the created configuration, empty string on failure. 
+	 * Creates a new VPN configuration that persists across multiple login sessions of the user.
+	 * @param name The name of the VPN configuration.
+	 * @param callback Called when the configuration is created or if there is an error.
+	 * Parameter id: A unique ID for the created configuration, empty string on failure.
 	 */
 	export function createConfig(name: string, callback: (id: string) => void): void;
 	/**
-	 * Destroys a VPN configuration created by the extension. 
-	 * @param id ID of the VPN configuration to destroy. 
-	 * @param callback Optional. Called when the configuration is destroyed or if there is an error. 
+	 * Destroys a VPN configuration created by the extension.
+	 * @param id ID of the VPN configuration to destroy.
+	 * @param callback Optional. Called when the configuration is destroyed or if there is an error.
 	 */
 	export function destroyConfig(id: string, callback?: Function): void;
 	/**
-	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension. 
-	 * @param parameters The parameters for the VPN session. 
-	 * @param callback Called when the parameters are set or if there is an error. 
+	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param parameters The parameters for the VPN session.
+	 * @param callback Called when the parameters are set or if there is an error.
 	 */
 	export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
 	/**
-	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension. 
-	 * @param data The IP packet to be sent to the platform. 
-	 * @param callback Optional. Called when the packet is sent or if there is an error. 
+	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+	 * @param data The IP packet to be sent to the platform.
+	 * @param callback Optional. Called when the packet is sent or if there is an error.
 	 */
 	export function sendPacket(data: ArrayBuffer, callback?: Function): void;
 	/**
-	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension. 
-	 * @param state The VPN session state of the VPN client. 
-	 * connected: VPN connection was successful. 
+	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param state The VPN session state of the VPN client.
+	 * connected: VPN connection was successful.
 	 * failure: VPN connection failed.
-	 * @param callback Optional. Called when the notification is complete or if there is an error.  
+	 * @param callback Optional. Called when the notification is complete or if there is an error.
 	 */
 	export function notifyConnectionStateChanged(state: string, callback?: Function): void;
-	
+
 	/** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
 	var onPlatformMessage: VpnPlatformMessageEvent;
 	/** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
@@ -7436,20 +6944,20 @@ declare module chrome.vpnProvider {
 // Wallpaper
 ////////////////////
 /**
- * Use the chrome.wallpaper API to change the ChromeOS wallpaper. 
+ * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
  * Permissions:  "wallpaper"
- * Important: This API works only on Chrome OS.    
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
-declare module chrome.wallpaper {
+declare namespace chrome.wallpaper {
 	interface WallpaperDetails {
 		/** Optional. The jpeg or png encoded wallpaper image. */
 		data?: any;
 		/** Optional. The URL of the wallpaper to be set. */
 		url?: string;
 		/**
-		 * The supported wallpaper layouts. 
-		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED" 
+		 * The supported wallpaper layouts.
+		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
 		 */
 		layout: string;
 		/** The file name of the saved wallpaper. */
@@ -7459,9 +6967,9 @@ declare module chrome.wallpaper {
 	}
 
 	/**
-	 * Sets wallpaper to the image at url or wallpaperData with the specified layout 
+	 * Sets wallpaper to the image at url or wallpaperData with the specified layout
 	 * @param callback
-	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60. 
+	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
 	 */
 	export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
 }
@@ -7470,14 +6978,14 @@ declare module chrome.wallpaper {
 // Web Navigation
 ////////////////////
 /**
- * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight. 
- * Permissions:  "webNavigation"   
+ * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight.
+ * Permissions:  "webNavigation"
  * @since Chrome 16.
  */
-declare module chrome.webNavigation {
+declare namespace chrome.webNavigation {
     interface GetFrameDetails {
 		/**
-		 * The ID of the process runs the renderer for this tab. 
+		 * The ID of the process runs the renderer for this tab.
 		 * @since Chrome 22.
 		 */
         processId: number;
@@ -7528,7 +7036,7 @@ declare module chrome.webNavigation {
 		/** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
 		frameId: number;
 		/**
-		 * The ID of the process runs the renderer for this tab. 
+		 * The ID of the process runs the renderer for this tab.
 		 * @since Chrome 22.
 		 */
 		processId: number;
@@ -7543,7 +7051,7 @@ declare module chrome.webNavigation {
 		/** The ID of the tab in which the navigation is triggered. */
         sourceTabId: number;
 		/**
-		 * The ID of the process runs the renderer for the source tab. 
+		 * The ID of the process runs the renderer for the source tab.
 		 * @since Chrome 22.
 		 */
         sourceProcessId: number;
@@ -7553,7 +7061,7 @@ declare module chrome.webNavigation {
 
 	interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
-		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists. 
+		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists.
 		 * @since Chrome 24.
 		 */
         parentFrameId: number;
@@ -7561,13 +7069,13 @@ declare module chrome.webNavigation {
 
 	interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
-		 * Cause of the navigation. 
-		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated" 
+		 * Cause of the navigation.
+		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated"
 		 */
 		transitionType: string;
 		/**
-		 * A list of transition qualifiers. 
-		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar" 
+		 * A list of transition qualifiers.
+		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar"
 		 */
 		transitionQualifiers: string[];
     }
@@ -7577,46 +7085,34 @@ declare module chrome.webNavigation {
         url: chrome.events.UrlFilter[];
     }
 
-	interface WebNavigationEvent extends chrome.events.Event {
-		addListener(callback: (details: WebNavigationCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
+	interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
+		addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
     }
 
-	interface WebNavigationFramedEvent extends WebNavigationEvent {
-		addListener(callback: (details: WebNavigationFramedCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+    interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
 
-	interface WebNavigationFramedErrorEvent extends WebNavigationFramedEvent {
-		addListener(callback: (details: WebNavigationFramedErrorCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+	interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
 
-	interface WebNavigationSourceEvent extends WebNavigationEvent {
-		addListener(callback: (details: WebNavigationSourceCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+	interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
 
-	interface WebNavigationParentedEvent extends WebNavigationEvent {
-		addListener(callback: (details: WebNavigationParentedCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+	interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
 
-	interface WebNavigationTransitionalEvent extends WebNavigationEvent {
-		addListener(callback: (details: WebNavigationTransitionCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+	interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
 
-	interface WebNavigationReplacementEvent extends WebNavigationEvent {
-		addListener(callback: (details: WebNavigationReplacementCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-    }
+	interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
 
 	/**
-	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID. 
-	 * @param details Information about the frame to retrieve information about. 
+	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
+	 * @param details Information about the frame to retrieve information about.
 	 * @param callback
-	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid. 
+	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid.
 	 */
     export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
 	/**
-	 * Retrieves information about all frames of a given tab. 
+	 * Retrieves information about all frames of a given tab.
 	 * @param details Information about the tab to retrieve all frames from.
 	 * @param callback
-	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.  
+	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.
 	 */
     export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
 
@@ -7625,14 +7121,14 @@ declare module chrome.webNavigation {
 	/** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
 	var onCompleted: WebNavigationFramedEvent;
 	/**
-	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL. 
+	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL.
 	 * @since Chrome 22.
 	 */
 	var onHistoryStateUpdated: WebNavigationTransitionalEvent;
 	/** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
 	var onCreatedNavigationTarget: WebNavigationSourceEvent;
 	/**
-	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab. 
+	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab.
 	 * @since Chrome 22.
 	 */
 	var onTabReplaced: WebNavigationReplacementEvent;
@@ -7650,11 +7146,11 @@ declare module chrome.webNavigation {
 // Web Request
 ////////////////////
 /**
- * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight. 
+ * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight.
  * Permissions:  "webRequest", host permissions
- * @since Chrome 17.   
+ * @since Chrome 17.
  */
-declare module chrome.webRequest {
+declare namespace chrome.webRequest {
     interface AuthCredentials {
         username: string;
         password: string;
@@ -7673,19 +7169,19 @@ declare module chrome.webRequest {
         cancel?: boolean;
 		/**
 		 * Optional.
-		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method. 
+		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method.
 		 */
         redirectUrl?: string;
 		/**
 		 * Optional.
-		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request). 
+		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request).
 		 */
         responseHeaders?: HttpHeader[];
 		/** Optional. Only used as a response to the onAuthRequired event. If set, the request is made using the supplied credentials. */
         authCredentials?: AuthCredentials;
 		/**
 		 * Optional.
-		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead. 
+		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead.
 		 */
         requestHeaders?: HttpHeader[];
     }
@@ -7695,8 +7191,8 @@ declare module chrome.webRequest {
 		/** Optional. */
         tabId?: number;
 		/**
-		 * A list of request types. Requests that cannot match any of the types will be filtered out. 
-		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
+		 * A list of request types. Requests that cannot match any of the types will be filtered out.
+		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
 		 */
         types?: string[];
 		/** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
@@ -7721,12 +7217,12 @@ declare module chrome.webRequest {
 		error?: string;
 		/**
 		 * Optional.
-		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}. 
+		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}.
 		 */
-		formData?: Object;
+		formData?: { [key: string]: string[] };
 		/**
 		 * Optional.
-		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array. 
+		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array.
 		 */
 		raw?: UploadData[];
 	}
@@ -7737,6 +7233,7 @@ declare module chrome.webRequest {
 	}
 
 	interface ResourceRequest {
+		url: string;
 		/** The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request. */
         requestId: string;
 		/** The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a subframe in which the request happens. If the document of a (sub-)frame is loaded (type is main_frame or sub_frame), frameId indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique within a tab. */
@@ -7746,8 +7243,8 @@ declare module chrome.webRequest {
 		/** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
 		tabId: number;
 		/**
-		 * How the requested resource will be used. 
-		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
+		 * How the requested resource will be used.
+		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
 		 */
         type: string;
 		/** The time when this signal is triggered, in milliseconds since the epoch. */
@@ -7755,7 +7252,6 @@ declare module chrome.webRequest {
     }
 
 	interface WebRequestDetails extends ResourceRequest {
-		url: string;
 		/** Standard HTTP method. */
 		method: string;
     }
@@ -7767,7 +7263,7 @@ declare module chrome.webRequest {
 
 	interface WebRequestBodyDetails extends WebRequestDetails {
 		/**
-		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'. 
+		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
 		 * @since Chrome 23.
 		 */
 		requestBody: WebRequestBody;
@@ -7780,7 +7276,7 @@ declare module chrome.webRequest {
 		/** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
         statusLine: string;
 		/**
-		 * Standard HTTP status code returned by the server. 
+		 * Standard HTTP status code returned by the server.
 		 * @since Chrome 43.
 		 */
 		statusCode: number;
@@ -7794,7 +7290,7 @@ declare module chrome.webRequest {
 	interface WebResponseCacheDetails extends WebResponseHeadersDetails {
 		/**
 		 * Optional.
-		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address. 
+		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
 		 */
         ip?: string;
 		/** Indicates if this response was fetched from disk cache. */
@@ -7808,7 +7304,7 @@ declare module chrome.webRequest {
 
 	interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
 		/** The authentication scheme, e.g. Basic or Digest. */
-		schema: string;
+		scheme: string;
 		/** The authentication realm provided by the server, if there is one. */
 		realm?: string;
 		/** The server requesting authentication. */
@@ -7822,36 +7318,32 @@ declare module chrome.webRequest {
 		error: string;
     }
 
-	interface WebRequestBodyEvent extends chrome.events.Event {
+	interface WebRequestBodyEvent extends chrome.events.Event<(details: WebRequestBodyDetails) => void> {
 		addListener(callback: (details: WebRequestBodyDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-	interface WebRequestHeadersEvent extends chrome.events.Event {
+	interface WebRequestHeadersEvent extends chrome.events.Event<(details: WebRequestHeadersDetails) => void> {
 		addListener(callback: (details: WebRequestHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-	interface WebResponseHeadersEvent extends chrome.events.Event {
-		addListener(callback: (details: WebResponseHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+	interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
+		addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-	interface WebResponseCacheEvent extends WebResponseHeadersEvent {
-		addListener(callback: (details: WebResponseCacheDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
-    }
+    interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
 
-	interface WebRedirectionResponseEvent extends WebResponseCacheEvent {
-		addListener(callback: (details: WebRedirectionResponseDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
-    }
+    interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
 
-	interface WebAuthenticationChallengeEvent extends chrome.events.Event {
-		addListener(callback: (details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void): void;
-    }
+	interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
 
-	interface WebResponseErrorEvent extends WebResponseCacheEvent {
-		addListener(callback: (details: WebResponseErrorDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+	interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {
+		addListener(callback: (details: WebAuthenticationChallengeDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
+	interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
+
 	/**
-	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often. 
+	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
 	 * @since Chrome 23.
 	 */
     var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
@@ -7883,110 +7375,97 @@ declare module chrome.webRequest {
 // Web Store
 ////////////////////
 /**
- * Use the chrome.webstore API to initiate app and extension installations "inline" from your site. 
+ * Use the chrome.webstore API to initiate app and extension installations "inline" from your site.
  * @since Chrome 15.
  */
-declare module chrome.webstore {
+declare namespace chrome.webstore {
 	/**
-	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page. 
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension. 
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page.
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(url: string, successCallback?: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
 	/**
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension. 
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(successCallback: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
 	/**
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
 
-	interface InstallationStageEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter stage: The InstallStage that just began. 
-		 * * One of: "installing", or "downloading"
-		 */
-		addListener(callback: (stage: string) => void): void;
-	}
+	interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
+
+	interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
 
-	interface DownloadProgressEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter percentDownloaded: The progress of the download, between 0 and 1. 0 indicates no progress; 1.0 indicates complete. 
-		 */
-		addListener(callback: (percentDownloaded: number) => void): void;
-	}
-	
 	/**
-	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins. 
+	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
 	 * @since Chrome 35.
 	 */
 	var onInstallStageChanged: InstallationStageEvent;
 	/**
-	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins. 
+	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
 	 * @since Chrome 35.
 	 */
 	var onDownloadProgress: DownloadProgressEvent;
@@ -7997,10 +7476,10 @@ declare module chrome.webstore {
 ////////////////////
 /**
  * Use the chrome.windows API to interact with browser windows. You can use this API to create, modify, and rearrange windows in the browser.
- * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.   
+ * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.
  * @since Chrome 5.
  */
-declare module chrome.windows {
+declare namespace chrome.windows {
     interface Window {
 		/** Array of tabs.Tab objects representing the current tabs in the window. */
         tabs?: chrome.tabs.Tab[];
@@ -8011,23 +7490,23 @@ declare module chrome.windows {
 		/** Optional. The width of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned width property, for example when querying closed windows from the sessions API. */
 		width?: number;
 		/**
-		 * The state of this browser window. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * The state of this browser window.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 17.
 		 */
         state: string;
 		/** Whether the window is currently the focused window. */
         focused: boolean;
 		/**
-		 * Whether the window is set to be always on top. 
+		 * Whether the window is set to be always on top.
 		 * @since Chrome 19.
 		 */
         alwaysOnTop: boolean;
 		/** Whether the window is incognito. */
         incognito: boolean;
 		/**
-		 * The type of browser window this is. 
-		 * One of: "normal", "popup", "panel", "app", or "devtools" 
+		 * The type of browser window this is.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
 		 */
         type: string;
 		/** Optional. The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may not be assigned an ID, for example when querying windows using the sessions API, in which case a session ID may be present. */
@@ -8035,7 +7514,7 @@ declare module chrome.windows {
 		/** Optional. The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may not be assigned left property, for example when querying closed windows from the sessions API. */
 		left?: number;
 		/**
-		 * The session ID used to uniquely identify a Window obtained from the sessions API. 
+		 * The session ID used to uniquely identify a Window obtained from the sessions API.
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
@@ -8044,12 +7523,12 @@ declare module chrome.windows {
     interface GetInfo {
 		/**
 		 * Optional.
-		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission. 
+		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission.
 		 */
         populate?: boolean;
 		/**
-		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows. 
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
+		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		windowTypes?: string[];
@@ -8057,50 +7536,50 @@ declare module chrome.windows {
 
     interface CreateData {
 		/**
-		 * Optional. The id of the tab for which you want to adopt to the new window. 
+		 * Optional. The id of the tab for which you want to adopt to the new window.
 		 * @since Chrome 10.
 		 */
         tabId?: number;
 		/**
 		 * Optional.
-		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
+		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
 		 */
 		url?: string | string[];
 		/**
 		 * Optional.
-		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
+		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
 		 */
         top?: number;
 		/**
 		 * Optional.
-		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height. 
+		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height.
 		 */
         height?: number;
 		/**
 		 * Optional.
-		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width. 
+		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width.
 		 */
         width?: number;
 		/**
-		 * Optional. If true, opens an active window. If false, opens an inactive window. 
+		 * Optional. If true, opens an active window. If false, opens an inactive window.
 		 * @since Chrome 12.
 		 */
         focused?: boolean;
 		/** Optional. Whether the new window should be an incognito window. */
         incognito?: boolean;
 		/**
-		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set. 
-		 * One of: "normal", "popup", "panel", or "detached_panel" 
+		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set.
+		 * One of: "normal", "popup", "panel", or "detached_panel"
 		 */
         type?: string;
 		/**
 		 * Optional.
-		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
+		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
 		 */
         left?: number;
 		/**
-		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 44.
 		 */
 		state?: string;
@@ -8110,7 +7589,7 @@ declare module chrome.windows {
 		/** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
         top?: number;
 		/**
-		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request. 
+		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request.
 		 * @since Chrome 14.
 		 */
         drawAttention?: boolean;
@@ -8119,13 +7598,13 @@ declare module chrome.windows {
 		/** Optional. The width to resize the window to in pixels. This value is ignored for panels. */
         width?: number;
 		/**
-		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 17.
 		 */
         state?: string;
 		/**
-		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front. 
+		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front.
 		 * @since Chrome 8.
 		 */
         focused?: boolean;
@@ -8135,65 +7614,53 @@ declare module chrome.windows {
 
 	interface WindowEventFilter {
 		/**
-		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows. 
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
+		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
 		 */
 		windowTypes: string[];
     }
 
-	interface WindowIdEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter windowId: The id of the window associated with this event.
-		 */
-		addListener(callback: (windowId: number, filters?: WindowEventFilter) => void): void;
-    }
+	interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
 
-	interface WindowReferenceEvent extends chrome.events.Event {
-		/**
-		 * @param callback
-		 * Parameter window: The window object associated with this event.
-		 */
-		addListener(callback: (window: Window, filters?: WindowEventFilter) => void): void;
-    }
+	interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
 
 	/**
-	 * The windowId value that represents the current window. 
+	 * The windowId value that represents the current window.
 	 * @since Chrome 18.
 	 */
     var WINDOW_ID_CURRENT: number;
 	/**
-	 * The windowId value that represents the absence of a chrome browser window. 
+	 * The windowId value that represents the absence of a chrome browser window.
 	 * @since Chrome 6.
 	 */
     var WINDOW_ID_NONE: number;
 
 	/** Gets details about a window. */
     export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
-	/** 
-	 * Gets details about a window. 
+	/**
+	 * Gets details about a window.
 	 * @since Chrome 18.
 	 */
     export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the current window. 
+	 * Gets the current window.
 	 */
     export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the current window. 
+	 * Gets the current window.
 	 * @since Chrome 18.
 	 */
     export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Creates (opens) a new browser with any optional sizing, position or default URL provided. 
+	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
 	 * @param callback
-	 * Optional parameter window: Contains details about the created window. 
+	 * Optional parameter window: Contains details about the created window.
 	 */
 	export function create(callback?: (window?: chrome.windows.Window) => void): void;
 	/**
 	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
 	 * @param callback
-	 * Optional parameter window: Contains details about the created window. 
+	 * Optional parameter window: Contains details about the created window.
 	 */
 	export function create(createData: CreateData, callback?: (window?: chrome.windows.Window) => void): void;
 	/**
@@ -8210,11 +7677,11 @@ declare module chrome.windows {
 	/** Removes (closes) a window, and all the tabs inside it. */
     export function remove(windowId: number, callback?: Function): void;
 	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'. 
+	 * Gets the window that was most recently focused — typically the window 'on top'.
 	 */
     export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'. 
+	 * Gets the window that was most recently focused — typically the window 'on top'.
 	 * @since Chrome 18.
 	 */
     export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
@@ -8223,9 +7690,9 @@ declare module chrome.windows {
 	var onRemoved: WindowIdEvent;
 	/** Fired when a window is created. */
 	var onCreated: WindowReferenceEvent;
-	/** 
-	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus. 
-	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another. 
+	/**
+	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus.
+	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another.
 	 */
 	var onFocusChanged: WindowIdEvent;
 }
diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts
index 9edad2c5c..718e7a312 100644
--- a/lib/wallet/wallet.ts
+++ b/lib/wallet/wallet.ts
@@ -947,7 +947,7 @@ export class Wallet {
         console.log("making fresh exchange");
       } else {
         if (updateTimeSec < r.last_update_time) {
-          console.log("outdated /keys, not updating")
+          console.log("outdated /keys, not updating");
           return Promise.resolve(r);
         }
         exchangeInfo = r;
diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts
index a8dc27524..68c744901 100644
--- a/lib/wallet/wxMessaging.ts
+++ b/lib/wallet/wxMessaging.ts
@@ -230,6 +230,50 @@ class ChromeNotifier implements Notifier {
   }
 }
 
+function executePayment(contractHash: string, payUrl: string, offerUrl: string) {
+
+}
+
+function offerContractFromUrl(contractUrl: string) {
+
+}
+
+
+function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url) {
+  const headers = {};
+  for (let kv of headerList) {
+    headers[kv.name.toLowerCase()] = kv.value;
+  }
+
+  const contractUrl = headers["x-taler-contract-url"];
+  if (contractUrl !== undefined) {
+    // The web shop is proposing a contract, we need to fetch it
+    // and show it to the user
+    offerContractFromUrl(contractUrl);
+    return;
+  }
+
+  const contractHash = headers["x-taler-contract-hash"];
+
+  if (contractHash !== undefined) {
+    const payUrl = headers["x-taler-pay-url"];
+    if (payUrl === undefined) {
+      console.log("malformed 402, X-Taler-Pay-Url missing");
+      return;
+    }
+
+    // Offer URL is optional
+    const offerUrl = headers["x-taler-offer-url"];
+    executePayment(contractHash, payUrl, offerUrl);
+    return;
+  }
+
+  // looks like it's not a taler request, it might be
+  // for a different payment system (or the shop is buggy)
+  console.log("ignoring non-taler 402 response");
+
+}
+
 
 export function wxMain() {
   chrome.browserAction.setBadgeText({text: ""});
@@ -260,6 +304,9 @@ export function wxMain() {
            let badge = new ChromeBadge();
            let notifier = new ChromeNotifier();
            let wallet = new Wallet(db, http, badge, notifier);
+
+           // Handlers for messages coming directly from the content
+           // script on the page
            let handlers = makeHandlers(db, wallet);
            chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
              try {
@@ -276,6 +323,17 @@ export function wxMain() {
                return false;
              }
            });
+
+           // Handlers for catching HTTP requests
+           chrome.webRequest.onHeadersReceived.addListener((details) => {
+             if (details.statusCode != 402) {
+               return;
+             }
+             return handleHttpPayment(details.responseHeaders, details.url);
+             details.responseHeaders
+           }, {urls: ["<all_urls>"]}, ["responseHeaders"]);
+
+
          })
          .catch((e) => {
            console.error("could not initialize wallet messaging");