Removed NodeMain from atom_main; removed unused printing_handler_win

(windows only)
brave · Dec 9, 2016 · 46407b6 · 46407b6
1 parent df57138
commit 46407b6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 200 deletions.
diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
@@ -94,12 +94,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     }
   }
 
-  if (run_as_node) {
-    // Now that argv conversion is done, we can finally start.
-    base::AtExitManager atexit_manager;
-    base::i18n::InitializeICU();
-    return atom::NodeMain(argc, argv);
-  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
+  if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
     return crash_service::Main(cmd);
   }
 

diff --git a/atom/utility/atom_content_utility_client.cc b/atom/utility/atom_content_utility_client.cc
@@ -21,10 +21,6 @@
 #include "net/proxy/proxy_resolver_v8.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
-#if defined(OS_WIN)
-#include "chrome/utility/printing_handler_win.h"
-#endif
-
 #if defined(ENABLE_EXTENSIONS)
 #include "atom/common/extensions/atom_extensions_client.h"
 #include "extensions/utility/utility_handler.h"

diff --git a/build/BUILD.gn b/build/BUILD.gn
@@ -76,6 +76,7 @@ config("electron_config") {
       "/wd4610", # user defined constructor required
       "/wd4702", # unreachable code
       "/wd4819", # The file contains a character that cannot be represented in the current code page
+      "/wd4267", # conversion from 'size_t' to 'int', possible loss of data
     ]
   }
 

diff --git a/chromium_src/chrome/utility/printing_handler_win.cc b/chromium_src/chrome/utility/printing_handler_win.cc
diff --git a/chromium_src/chrome/utility/printing_handler_win.h b/chromium_src/chrome/utility/printing_handler_win.h