Merge branch 'nw21' of https://github.com/nwjs/chromium.src into nw21

Author: janRucka

base/native_library_win.cc

@@ -7,17 +7,88 @@
 #include <windows.h>
 
 #include "base/files/file_util.h"
+#include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/win/iat_patch_function.h"
+#include "chrome/common/chrome_paths.h"
 
 namespace base {
 
 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
 
 namespace {
 
+base::win::IATPatchFunction* FlashCreateProcessProxy = nullptr;
+
+BOOL WINAPI CreateProcessAForFlash(
+  _In_opt_ LPCSTR lpApplicationName,
+  _Inout_opt_ LPSTR lpCommandLine,
+  _In_opt_ LPSECURITY_ATTRIBUTES lpProcessAttributes,
+  _In_opt_ LPSECURITY_ATTRIBUTES lpThreadAttributes,
+  _In_ BOOL bInheritHandles,
+  _In_ DWORD dwCreationFlags,
+  _In_opt_ LPVOID lpEnvironment,
+  _In_opt_ LPCSTR lpCurrentDirectory,
+  _In_ LPSTARTUPINFOA lpStartupInfo,
+  _Out_ LPPROCESS_INFORMATION lpProcessInformation) {
+  bool unhook = false;
+  if (FlashCreateProcessProxy != nullptr &&
+    strstr(lpCommandLine, "cmd.exe /c echo NOT SANDBOXED") != NULL) {
+    unhook = true;
+    dwCreationFlags |= CREATE_NO_WINDOW;
+  }
+
+  typedef BOOL(WINAPI *CREATE_PROC) (
+    LPCSTR,
+    LPSTR,
+    LPSECURITY_ATTRIBUTES,
+    LPSECURITY_ATTRIBUTES,
+    BOOL,
+    DWORD,
+    LPVOID,
+    LPCSTR,
+    LPSTARTUPINFOA,
+    LPPROCESS_INFORMATION
+    );
+
+  if (FlashCreateProcessProxy != nullptr) {
+    CREATE_PROC createProc = (CREATE_PROC)FlashCreateProcessProxy->original_function();
+    BOOL retVal = createProc(
+      lpApplicationName,
+      lpCommandLine,
+      lpProcessAttributes,
+      lpThreadAttributes,
+      bInheritHandles,
+      dwCreationFlags,
+      lpEnvironment,
+      lpCurrentDirectory,
+      lpStartupInfo,
+      lpProcessInformation
+    );
+
+    if (unhook) {
+      DWORD lastError = GetLastError();
+      delete FlashCreateProcessProxy;
+      FlashCreateProcessProxy = nullptr;
+      SetLastError(lastError);
+    }
+    return retVal;
+  }
+  return FALSE;
+}
+
+bool IsFlash(const FilePath& library_path) {
+  base::FilePath flash_filename;
+  if (!PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+    &flash_filename))
+    return false;
+
+  return flash_filename == library_path;
+}
+
 NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
                                       LoadLibraryFunction load_library_api,
                                       NativeLibraryLoadError* error) {
@@ -42,6 +113,20 @@ NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
     error->code = GetLastError();
   }
 
+  if (module) {
+    if (IsFlash(library_path)) {
+      FlashCreateProcessProxy = new base::win::IATPatchFunction;
+      if (NO_ERROR != 
+        FlashCreateProcessProxy->Patch(library_path.value().c_str(), 
+                                       "kernel32.dll", 
+                                       "CreateProcessA", 
+                                       CreateProcessAForFlash)) {
+        delete FlashCreateProcessProxy;
+        FlashCreateProcessProxy = nullptr;
+      }
+    }
+  }
+
   if (restore_directory)
     SetCurrentDirectory(current_directory);
 

chrome/browser/download/download_ui_controller.cc

@@ -18,6 +18,9 @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
+#include "extensions/browser/app_window/native_app_window.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/download/download_controller_base.h"
@@ -159,6 +162,20 @@ void DownloadUIController::OnDownloadUpdated(content::DownloadManager* manager,
 #if !defined(OS_ANDROID)
   content::WebContents* web_contents = item->GetWebContents();
   if (web_contents) {
+    Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
+    extensions::AppWindowRegistry* registry = extensions::AppWindowRegistry::Get(profile);
+    if (!registry)
+      return;
+    extensions::AppWindow* app_window = registry->GetAppWindowForWebContents(web_contents);
+    if (!app_window)
+      return;
+    if (web_contents->GetController().IsInitialNavigation() &&
+        app_window->NWCanClose() &&
+        !item->IsSavePackageDownload()) {
+      app_window->GetBaseWindow()->Close();
+    }
+
+#if 0
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
     // If the download occurs in a new tab, and it's not a save page
     // download (started before initial navigation completed) close it.
@@ -172,6 +189,7 @@ void DownloadUIController::OnDownloadUpdated(content::DownloadManager* manager,
         !item->IsSavePackageDownload()) {
       web_contents->Close();
     }
+#endif
   }
 #endif
 

chrome/browser/ui/chrome_bubble_manager.cc

@@ -111,13 +111,15 @@ static void LogBubbleCloseReason(BubbleReference bubble,
 ChromeBubbleManager::ChromeBubbleManager(TabStripModel* tab_strip_model)
     : tab_strip_model_(tab_strip_model) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK(tab_strip_model_);
-  tab_strip_model_->AddObserver(this);
+  //DCHECK(tab_strip_model_);
+  if (tab_strip_model_)
+    tab_strip_model_->AddObserver(this);
   AddBubbleManagerObserver(&chrome_bubble_metrics_);
 }
 
 ChromeBubbleManager::~ChromeBubbleManager() {
-  tab_strip_model_->RemoveObserver(this);
+  if (tab_strip_model_)
+    tab_strip_model_->RemoveObserver(this);
 
   // Finalize requests before removing the BubbleManagerObserver so it can
   // collect metrics when closing any open bubbles.

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h

@@ -16,13 +16,18 @@ class Browser;
 @class ChooserBubbleUiController;
 class ChooserController;
 
+namespace extensions {
+class AppWindow;
+}
+
 // ChooserBubbleUiCocoa implements a chooser-based permission model.
 // It uses |NSTableView| to show a list of options for user to grant
 // permission. It can be used by the WebUSB or WebBluetooth APIs.
 // It is owned by the BubbleController, which is owned by the BubbleManager.
 class ChooserBubbleUiCocoa : public BubbleUi {
  public:
   ChooserBubbleUiCocoa(Browser* browser,
+                       extensions::AppWindow* app_window,
                        std::unique_ptr<ChooserController> chooser_controller);
   ~ChooserBubbleUiCocoa() override;
 
@@ -36,6 +41,7 @@ class ChooserBubbleUiCocoa : public BubbleUi {
 
  private:
   Browser* browser_;  // Weak.
+  extensions::AppWindow* app_window_;
   // Cocoa-side chooser bubble UI controller. Weak, as it will close itself.
   ChooserBubbleUiController* chooser_bubble_ui_controller_;
 

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

@@ -4,6 +4,7 @@
 
 #import "chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h"
 
+#include "extensions/browser/app_window/app_window.h"
 #include <stddef.h>
 
 #include <algorithm>
@@ -29,7 +30,7 @@
 #include "ui/base/cocoa/window_size_constants.h"
 
 std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
-  return base::MakeUnique<ChooserBubbleUiCocoa>(browser_,
+  return base::MakeUnique<ChooserBubbleUiCocoa>(browser_, app_window_,
                                                 std::move(chooser_controller_));
 }
 
@@ -47,10 +48,12 @@ @interface ChooserBubbleUiController
   NSButton* cancelButton_;   // Weak.
 
   Browser* browser_;  // Weak.
+  extensions::AppWindow* app_window_;
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
 - (id)initWithBrowser:(Browser*)browser
+    appWindow:(extensions::AppWindow*)app_window
     chooserController:(std::unique_ptr<ChooserController>)chooserController
                bridge:(ChooserBubbleUiCocoa*)bridge;
 
@@ -88,13 +91,15 @@ - (void)onCancel:(id)sender;
 @implementation ChooserBubbleUiController
 
 - (id)initWithBrowser:(Browser*)browser
+    appWindow:(extensions::AppWindow*)app_window
     chooserController:(std::unique_ptr<ChooserController>)chooserController
                bridge:(ChooserBubbleUiCocoa*)bridge {
-  DCHECK(browser);
+  //DCHECK(browser);
   DCHECK(chooserController);
   DCHECK(bridge);
 
   browser_ = browser;
+  app_window_ = app_window;
 
   base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]
       initWithContentRect:ui::kWindowSizeDeterminedLater
@@ -242,16 +247,20 @@ - (NSPoint)getExpectedAnchorPoint {
 }
 
 - (bool)hasLocationBar {
-  return browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
+  return false; //browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
 - (info_bubble::BubbleArrowLocation)getExpectedArrowLocation {
   return [self hasLocationBar] ? info_bubble::kTopLeft : info_bubble::kNoArrow;
 }
 
 - (NSWindow*)getExpectedParentWindow {
-  DCHECK(browser_->window());
-  return browser_->window()->GetNativeWindow();
+  if (browser_) {
+    DCHECK(browser_->window());
+    return browser_->window()->GetNativeWindow();
+  } else {
+    return app_window_->GetNativeWindow();
+  }
 }
 
 + (CGFloat)matchWidthsOf:(NSView*)viewA andOf:(NSView*)viewB {
@@ -291,13 +300,16 @@ - (void)onCancel:(id)sender {
 
 ChooserBubbleUiCocoa::ChooserBubbleUiCocoa(
     Browser* browser,
+    extensions::AppWindow* app_window,
     std::unique_ptr<ChooserController> chooser_controller)
     : browser_(browser),
+      app_window_(app_window),
       chooser_bubble_ui_controller_(nil) {
-  DCHECK(browser_);
+  //DCHECK(browser_);
   DCHECK(chooser_controller);
   chooser_bubble_ui_controller_ = [[ChooserBubbleUiController alloc]
         initWithBrowser:browser_
+        appWindow:app_window_
       chooserController:std::move(chooser_controller)
                  bridge:this];
 }

chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
 
+#include "extensions/components/native_app_window/native_app_window_views.h"
 #include <stddef.h>
 
 #include <memory>
@@ -29,7 +30,7 @@
 #include "ui/views/window/dialog_client_view.h"
 
 std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
-  return base::MakeUnique<ChooserBubbleUiView>(browser_,
+  return base::MakeUnique<ChooserBubbleUiView>(browser_, app_window_,
                                                std::move(chooser_controller_));
 }
 
@@ -184,12 +185,13 @@ void ChooserBubbleUiViewDelegate::UpdateTableView() const {
 // ChooserBubbleUiView
 ChooserBubbleUiView::ChooserBubbleUiView(
     Browser* browser,
+    void* app_window,
     std::unique_ptr<ChooserController> chooser_controller)
-    : browser_(browser), chooser_bubble_ui_view_delegate_(nullptr) {
-  DCHECK(browser_);
+  : browser_(browser), app_window_((extensions::AppWindow*)app_window), chooser_bubble_ui_view_delegate_(nullptr) {
+  //DCHECK(browser_);
   DCHECK(chooser_controller);
   chooser_bubble_ui_view_delegate_ = new ChooserBubbleUiViewDelegate(
-      GetAnchorView(), GetAnchorArrow(), std::move(chooser_controller));
+      nullptr, GetAnchorArrow(), std::move(chooser_controller));
 }
 
 ChooserBubbleUiView::~ChooserBubbleUiView() {}
@@ -198,10 +200,11 @@ void ChooserBubbleUiView::Show(BubbleReference bubble_reference) {
   chooser_bubble_ui_view_delegate_->set_bubble_reference(bubble_reference);
 
   // Set |parent_window| because some valid anchors can become hidden.
-  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
-      browser_->window()->GetNativeWindow());
-  chooser_bubble_ui_view_delegate_->set_parent_window(widget->GetNativeView());
-
+  views::Widget* widget = nullptr;
+  if (browser_) {
+    widget = views::Widget::GetWidgetForNativeWindow(browser_->window()->GetNativeWindow());
+    chooser_bubble_ui_view_delegate_->set_parent_window(widget->GetNativeView());
+  }
   views::BubbleDialogDelegateView::CreateBubble(
       chooser_bubble_ui_view_delegate_)
       ->Show();
@@ -217,6 +220,7 @@ void ChooserBubbleUiView::UpdateAnchorPosition() {
 }
 
 views::View* ChooserBubbleUiView::GetAnchorView() {
+  if (browser_) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
 
   if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
@@ -228,10 +232,16 @@ views::View* ChooserBubbleUiView::GetAnchorView() {
     return browser_view->exclusive_access_bubble()->GetView();
 
   return browser_view->top_container();
+  } else if (app_window_) {
+    native_app_window::NativeAppWindowViews* native_app_window_views =
+      static_cast<native_app_window::NativeAppWindowViews*>(app_window_->GetBaseWindow());
+    return native_app_window_views->web_view();
+  }
+  return nullptr;
 }
 
 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
-  if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
+  if (browser_ && browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return views::BubbleBorder::TOP_LEFT;
   return views::BubbleBorder::NONE;
 }

chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h

@@ -15,6 +15,10 @@ namespace views {
 class View;
 }
 
+namespace extensions {
+  class AppWindow;
+}
+
 class Browser;
 class ChooserController;
 class ChooserBubbleUiViewDelegate;
@@ -26,7 +30,7 @@ class ChooserBubbleUiViewDelegate;
 // BubbleManager.
 class ChooserBubbleUiView : public BubbleUi {
  public:
-  ChooserBubbleUiView(Browser* browser,
+  ChooserBubbleUiView(Browser* browser, void* app_window,
                       std::unique_ptr<ChooserController> chooser_controller);
   ~ChooserBubbleUiView() override;
 
@@ -40,6 +44,7 @@ class ChooserBubbleUiView : public BubbleUi {
   views::BubbleBorder::Arrow GetAnchorArrow();
 
   Browser* browser_;  // Weak.
+  extensions::AppWindow* app_window_;
   // Weak. Owned by its parent view.
   ChooserBubbleUiViewDelegate* chooser_bubble_ui_view_delegate_;