Merge branch 'nw27' into nw28

rogerwang · rogerwang · commit d682eb8826f4 · 2018-01-12T20:35:16.000+08:00
diff --git a/docs/For Users/Debugging with DevTools.md b/docs/For Users/Debugging with DevTools.md
@@ -8,7 +8,7 @@
 
 DevTools can be opened with keyboard shortcut <kbd>F12</kbd> on Windows and Linux or <kbd>&#8984;</kbd>+<kbd>&#8997;</kbd>+<kbd>i</kbd> on Mac.
 
-Alternatively, you may open DevTools programmatically using NW.js API [win.showDevTools()`](../References/Window.md##winshowdevtoolsiframe-headless-callback) for a window.
+Alternatively, you may open DevTools programmatically using NW.js API [win.showDevTools()](../References/Window.md#winshowdevtoolsiframe-callback) for a window.
 
 ## Node.js Modules Debugging
 
diff --git a/docs/References/Clipboard.md b/docs/References/Clipboard.md
@@ -36,7 +36,7 @@ clipboard.clear();
 * `type` `{String}` _Optional_ the type of the data. Support `text`, `png`, `jpeg`, `html` and `rtf`. By default, `type` is set to `"text"`.
 * `raw`  `{Boolean}` _Optional_ requiring raw image data. This option is only valid if type is `png` or `jpeg`. By default, `raw` is set to `false`.
 
-Write `data` of `type` to the clipboard. This method will clear the clipboard and replace with the given `data`. Hence another call to this method will overwrite with the new one. To write multiple types of data to clipboard simultaneously, you will need to use [clip.set(clipboardDataList)](clipsetclipboardDataList) below.
+Write `data` of `type` to the clipboard. This method will clear the clipboard and replace with the given `data`. Hence another call to this method will overwrite with the new one. To write multiple types of data to clipboard simultaneously, you will need to use [clip.set(clipboardDataList)](#clipsetclipboarddatalist) below.
 
 !!! tip "Format of Image"
     Images read or written from clipboard can be either JPEG or PNG. When `raw` is not set or set to `false`, the data is expected to be a valid [data URI](https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs) encoded with Base64. When `raw` is set to `true`, the data is only the Base64 encoded image data not including the `data:<mime-type>;base64,` part.
@@ -47,7 +47,7 @@ Write `data` of `type` to the clipboard. This method will clear the clipboard an
 
 ## clip.set(clipboardDataList)
 
-* `clipboardDataList` `{Array}` Array of `clipboardData` to be written to clipboard. See [clip.set(clipboardData)](#clipsetclipboardData) and [clip.set(data, [type, [raw]])](#clipsetdata-type-raw) for detailed arguments specification.
+* `clipboardDataList` `{Array}` Array of `clipboardData` to be written to clipboard. See [clip.set(clipboardData)](#clipgetclipboarddata) and [clip.set(data, [type, [raw]])](#clipsetdata-type-raw) for detailed arguments specification.
 
 Multiple types of data can be written to clipboard simultaneously with this method.
 
@@ -87,12 +87,12 @@ Get the data of `type` from clipboard.
 
 ## clip.get(clipboardDataList)
 
-* `clipboardDataList` `{Array}` Array of `clipboardData` for reading data from clipboard. Multiple types of data can be read from clipboard simultaneously with this method. See [clip.get(clipboardData)](#clipgetclipboardData) and [clip.get([type, [raw]])](#clipgettype-raw) for detailed arguments specification.
+* `clipboardDataList` `{Array}` Array of `clipboardData` for reading data from clipboard. Multiple types of data can be read from clipboard simultaneously with this method. See [clip.get(clipboardData)](#clipgetclipboarddata) and [clip.get([type, [raw]])](#clipgettype-raw) for detailed arguments specification.
 * Returns `{Array}` array of `clipboardData` retrieved from the clipboard. Each item contains `type`, `data` and `raw` (optional) attributes.
 
 ## clip.readAvailableTypes()
 
-* Returns `{Array}` list of available types of data in clipboard currenly. Each item is one of following types:
+* Returns `{Array}` list of available types of data in clipboard currently. Each item is one of following types:
     - `text`: plain text. Can be read by `clip.get('text')`.
     - `html`: HTML text. Can be read by `clip.get('html')`.
     - `rtf`: RTF (Rich Text Format). Can be read by `clip.get('rtf')`.
diff --git a/src/browser/nw_extensions_browser_hooks.cc b/src/browser/nw_extensions_browser_hooks.cc
@@ -30,6 +30,7 @@
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/webview_info.h"
+#include "extensions/common/manifest_url_handlers.h"
 
 #if defined(OS_WIN)
 #define _USE_MATH_DEFINES
@@ -204,10 +205,25 @@ bool RphGuestFilterURLHook(RenderProcessHost* rph, const GURL* url)  {
 typedef bool (*RphGuestFilterURLHookFn)(content::RenderProcessHost* rph, const GURL* url);
 CONTENT_EXPORT extern RphGuestFilterURLHookFn gRphGuestFilterURLHook;
 
+bool GuestSwapProcessHook(content::BrowserContext* browser_context, const GURL& url) {
+  if (!url.SchemeIs("chrome-extension"))
+    return false;
+  ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context);
+  std::string extension_id = url.host();
+  const Extension* extension = registry->enabled_extensions().GetByID(extension_id);
+  if (extension && !extensions::ManifestURL::Get(extension, "devtools_page").is_empty())
+    return true;
+  return false;
+}
+
+typedef bool(*GuestSwapProcessHookFn)(content::BrowserContext*, const GURL& url);
+CONTENT_EXPORT extern GuestSwapProcessHookFn gGuestSwapProcessHook;
+
 void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
                               const base::FilePath& extension_path,
                               std::string* error) {
   gRphGuestFilterURLHook = RphGuestFilterURLHook;
+  gGuestSwapProcessHook = GuestSwapProcessHook;
   if (!manifest)
     return;
 
