From: Simon Madine <simon.madine@here.com>
Date: Fri, 29 Jan 2016 21:51:06 +0000 (+0100)
Subject: Only add Hide if OS_X is defined
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a643ec3c86852a17edb472b1a1b9b53120f3ace;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Only add Hide if OS_X is defined
---

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 441b055..0562cf8 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -356,7 +356,6 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
       .SetMethod("quit", base::Bind(&Browser::Quit, browser))
       .SetMethod("exit", base::Bind(&Browser::Exit, browser))
       .SetMethod("focus", base::Bind(&Browser::Focus, browser))
-      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
       .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
       .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
       .SetMethod("getName", base::Bind(&Browser::GetName, browser))
@@ -368,6 +367,9 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
                  base::Bind(&Browser::ClearRecentDocuments, browser))
       .SetMethod("setAppUserModelId",
                  base::Bind(&Browser::SetAppUserModelID, browser))
+#if defined(OS_MACOSX)
+      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
+#endif
 #if defined(OS_WIN)
       .SetMethod("setUserTasks",
                  base::Bind(&Browser::SetUserTasks, browser))
diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 711415e..dc811fc 100644
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -55,9 +55,6 @@ class Browser : public WindowListObserver {
   // Focus the application.
   void Focus();
 
-  // Focus the application.
-  void Hide();
-
   // Returns the version of the executable (or bundle).
   std::string GetVersion() const;
 
@@ -80,6 +77,9 @@ class Browser : public WindowListObserver {
   void SetAppUserModelID(const base::string16& name);
 
 #if defined(OS_MACOSX)
+  // Hide the application.
+  void Hide();
+
   // Bounce the dock icon.
   enum BounceType {
     BOUNCE_CRITICAL = 0,