Merge pull request nwjs#950 from kingFighter/mac

rogerwang · rogerwang · commit c7b81f2e684b · 2013-08-06T00:15:56.000-07:00
Fix build errors on Mac
diff --git a/src/api/menu/menu_mac.mm b/src/api/menu/menu_mac.mm
@@ -80,7 +80,7 @@
 
   {
     // Make sure events can be pumped while the menu is up.
-    MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
+    base::MessageLoop::ScopedNestableTaskAllower allow(base::MessageLoop::current());
 
     // One of the events that could be pumped is |window.close()|.
     // User-initiated event-tracking loops protect against this by
diff --git a/src/browser/shell_application_mac.h b/src/browser/shell_application_mac.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_NW_SRC_BROWSER_SHELL_APPLICATION_MAC_H_
 #define CONTENT_NW_SRC_BROWSER_SHELL_APPLICATION_MAC_H_
 
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
 #include "base/mac/scoped_sending_event.h"
 
 @interface ShellCrApplication : NSApplication<CrAppProtocol,
diff --git a/src/browser/shell_download_manager_delegate_mac.mm b/src/browser/shell_download_manager_delegate_mac.mm
@@ -28,7 +28,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
diff --git a/src/renderer/printing/print_web_view_helper_mac.mm b/src/renderer/printing/print_web_view_helper_mac.mm
@@ -16,8 +16,8 @@
 #include "printing/page_size_margins.h"
 #include "skia/ext/platform_device.h"
 #include "skia/ext/vector_canvas.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/public/platform/WebCanvas.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 
 namespace printing {
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@`
`80`	`80`
`81`	`81`	`{`
`82`	`82`	`// Make sure events can be pumped while the menu is up.`
`83`		`- MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());`
	`83`	`+ base::MessageLoop::ScopedNestableTaskAllower allow(base::MessageLoop::current());`
`84`	`84`
`85`	`85`	`// One of the events that could be pumped is \|window.close()\|.`
`86`	`86`	`// User-initiated event-tracking loops protect against this by`