nw2: fix Window.title schema error; get title with window id

rogerwang · rogerwang · commit 08991a15945b · 2019-01-06T04:33:27.000-07:00
Ref nwjs#5875
diff --git a/src/api/nw_current_window_internal.idl b/src/api/nw_current_window_internal.idl
@@ -41,8 +41,8 @@ namespace nw.currentWindowInternal {
     static double getZoom();
     static void setZoom(double level);
     static void setShowInTaskbar(boolean show);
-    static DOMString getTitleInternal();
-    static void setTitleInternal(DOMString title);
+    static DOMString getTitleInternal(optional long winId);
+    static void setTitleInternal(DOMString title, optional long winId);
     static object getWinParamInternal();
     static object getCurrent(long id, optional object getInfo);
     static void getPrinters(GetPrintersCallback callback);
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -786,20 +786,17 @@ bool NwCurrentWindowInternalGetTitleInternalFunction::RunNWSync(base::ListValue*
     response->AppendString(window->title_override());
     return true;
   }
-  Browser* browser = nullptr;
-  std::string error;
-  if (!windows_util::GetBrowserFromWindowID(
-     this, extension_misc::kCurrentWindowId, WindowController::GetAllWindowFilter(),
-          &browser, &error)) {
-    *ret_error = error;
-    return false;
-  }
-  if (!browser) {
-    *ret_error = "no window found";
-    return false;
+  if (base::FeatureList::IsEnabled(::features::kNWNewWin)) {
+    int id = 0;
+    args_->GetInteger(0, &id);
+    Browser* browser = getBrowser(this, id);
+    if (browser) {
+      response->AppendString(browser->GetWindowTitleForCurrentTab(false));
+      return true;
+    }
   }
-  response->AppendString(browser->GetWindowTitleForCurrentTab(false));
-  return true;
+  *ret_error = "no window found";
+  return false;
 }
 
 ExtensionFunction::ResponseAction
@@ -826,6 +823,7 @@ bool NwCurrentWindowInternalSetTitleInternalFunction::RunNWSync(base::ListValue*
       return false;
     browser->set_title_override(title);
     browser->window()->UpdateTitleBar();
+    return true;
   }
   AppWindow* window = getAppWindow(this);
   window->set_title_override(title);
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -566,7 +566,7 @@ Object.defineProperty(NWWindow.prototype, 'height', {
 });
 Object.defineProperty(NWWindow.prototype, 'title', {
   get: function() {
-    return currentNWWindowInternal.getTitleInternal();
+    return currentNWWindowInternal.getTitleInternal(this.cWindow.id);
   },
   set: function(val) {
     currentNWWindowInternal.setTitleInternal(val, this.cWindow.id);
