Windows Build Errors fixes

common.gypi

@@ -42,6 +42,7 @@
     'msvs_disabled_warnings': [
       4189,  # local variable is initialized but not referenced
       4819,  # The file contains a character that cannot be represented in the current code page
+      4201,  # nameless struct/union
       4996,  # (atlapp.h) 'GetVersionExW': was declared deprecated
     ],
     'msvs_settings': {

src/api/api.h

@@ -8,6 +8,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/callback.h"
 
 namespace base {
 class Thread;

src/api/api_server.cc

@@ -15,7 +15,6 @@
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "net/socket/socket_descriptor.h"
-#include "net/socket/unix_domain_socket_posix.h"
 #include "content/public/browser/browser_thread.h"
 
 using namespace content;

src/api/api_server.h

@@ -7,9 +7,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
-#include "net/socket/stream_listen_socket.h"
-#include "net/socket/socket_descriptor.h"
-#include "net/socket/unix_domain_socket_posix.h"
 #include "base/files/file_path.h"
 
 #include "src/api/api_binding.h"

src/browser/dialog/file_select_helper.cc

@@ -240,7 +240,7 @@ FileSelectHelper::GetFileTypesFromAcceptType(
   int valid_type_count = 0;
   int description_id = 0;
   for (size_t i = 0; i < accept_types.size(); ++i) {
-    std::string ascii_type = UTF16ToASCII(accept_types[i]);
+    std::string ascii_type = base::UTF16ToASCII(accept_types[i]);
     if (!IsAcceptTypeValid(ascii_type))
       continue;
 

src/browser/thrust_window.cc

@@ -11,6 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/file_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"

src/browser/thrust_window.h

@@ -62,7 +62,7 @@ class MenuBar;
 //
 // This represents an ThrustShell window. The window opens on a `root_url` 
 // provided at creation. The window exposes only one webcontents with support 
-// for the <exoframe> tag.
+// for the <webview> tag.
 //
 // The ThrustWindow lives on the BrowserThread::UI thread
 class ThrustWindow : public brightray::DefaultWebContentsDelegate,
@@ -195,6 +195,11 @@ class ThrustWindow : public brightray::DefaultWebContentsDelegate,
   // Returns whether the window is closed or not
   bool is_closed() { return is_closed_; }
 
+  // ### HasFrame
+  //
+  // Returns wether the window has frame or not
+  bool HasFrame() { return has_frame_; }
+
   // ### WindowSize
   //
   // Retrieves the native Window size
@@ -210,7 +215,7 @@ class ThrustWindow : public brightray::DefaultWebContentsDelegate,
   // Returns the NativeWindow for this Shell
   gfx::NativeWindow GetNativeWindow() { return PlatformGetNativeWindow(); }
 
-  // ### web_contents
+  // ### GetWebContents
   //
   // Returns the underlying web_contents
   content::WebContents* GetWebContents() const;

src/browser/ui/views/win_frame_view.cc

@@ -41,7 +41,7 @@ int
 WinFrameView::NonClientHitTest(
     const gfx::Point& point) 
 {
-  if (shell_->has_frame())
+  if (window_->HasFrame())
     return frame_->client_view()->NonClientHitTest(point);
   else
     return FramelessView::NonClientHitTest(point);

thrust_shell.gyp

@@ -391,18 +391,6 @@
       'target_name': '<(project_name)_js',
       'type': 'none',
       'actions': [
-        {
-          'inputs': [
-            'src/renderer/extensions/resources/web_view.js',
-          ],
-          'outputs': [
-            'src/renderer/extensions/resources/web_view.js.bin',
-          ],
-          'action_name': 'xxd web_view.js',
-          'action': ['xxd', '-i', 
-          'src/renderer/extensions/resources/web_view.js',
-          'src/renderer/extensions/resources/web_view.js.bin'],
-        },
       ],
     },  # target <(product_name)_js
     {