Merge branch 'master' into chrome35

Conflicts:
	atom/browser/native_window_gtk.h

atom/browser/api/atom_api_window.cc

@@ -149,6 +149,10 @@ void Window::Unmaximize() {
   window_->Unmaximize();
 }
 
+bool Window::IsMaximized() {
+  return window_->IsMaximized();
+}
+
 void Window::Minimize() {
   window_->Minimize();
 }
@@ -342,6 +346,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("isVisible", &Window::IsVisible)
       .SetMethod("maximize", &Window::Maximize)
       .SetMethod("unmaximize", &Window::Unmaximize)
+      .SetMethod("isMaximized", &Window::IsMaximized)
       .SetMethod("minimize", &Window::Minimize)
       .SetMethod("restore", &Window::Restore)
       .SetMethod("setFullScreen", &Window::SetFullscreen)

atom/browser/api/atom_api_window.h

@@ -63,6 +63,7 @@ class Window : public mate::EventEmitter,
   bool IsVisible();
   void Maximize();
   void Unmaximize();
+  bool IsMaximized();
   void Minimize();
   void Restore();
   void SetFullscreen(bool fullscreen);

atom/browser/native_window.h

@@ -107,6 +107,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
   virtual bool IsVisible() = 0;
   virtual void Maximize() = 0;
   virtual void Unmaximize() = 0;
+  virtual bool IsMaximized() = 0;
   virtual void Minimize() = 0;
   virtual void Restore() = 0;
   virtual void SetFullscreen(bool fullscreen) = 0;

atom/browser/native_window_mac.h

@@ -32,6 +32,7 @@ class NativeWindowMac : public NativeWindow {
   virtual bool IsVisible() OVERRIDE;
   virtual void Maximize() OVERRIDE;
   virtual void Unmaximize() OVERRIDE;
+  virtual bool IsMaximized() OVERRIDE;
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;

atom/browser/native_window_mac.mm

@@ -279,6 +279,10 @@ void NativeWindowMac::Unmaximize() {
   [window_ zoom:nil];
 }
 
+bool NativeWindowMac::IsMaximized() {
+  return [window_ isZoomed];
+}
+
 void NativeWindowMac::Minimize() {
   [window_ miniaturize:nil];
 }

atom/browser/native_window_views.cc

@@ -140,6 +140,10 @@ void NativeWindowViews::Unmaximize() {
   window_->Restore();
 }
 
+bool NativeWindowViews::IsMaximized() {
+  return window_->IsMaximized();
+}
+
 void NativeWindowViews::Minimize() {
   window_->Minimize();
 }

atom/browser/native_window_views.h

@@ -38,6 +38,7 @@ class NativeWindowViews : public NativeWindow,
   virtual bool IsVisible() OVERRIDE;
   virtual void Maximize() OVERRIDE;
   virtual void Unmaximize() OVERRIDE;
+  virtual bool IsMaximized() OVERRIDE;
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;

atom/browser/native_window_win.cc

@@ -294,6 +294,10 @@ void NativeWindowWin::Unmaximize() {
   window_->Restore();
 }
 
+bool NativeWindowWin::IsMaximized() {
+  return window_->IsMaximized();
+}
+
 bool NativeWindowWin::IsVisible() {
   return window_->IsVisible();
 }

atom/browser/native_window_win.h

@@ -49,6 +49,7 @@ class NativeWindowWin : public NativeWindow,
   virtual bool IsVisible() OVERRIDE;
   virtual void Maximize() OVERRIDE;
   virtual void Unmaximize() OVERRIDE;
+  virtual bool IsMaximized() OVERRIDE;
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;

atom/common/platform_util_win.cc

@@ -175,7 +175,7 @@ void MoveItemToTrash(const base::FilePath& path) {
   SHFILEOPSTRUCT file_operation = {0};
   file_operation.wFunc = FO_DELETE;
   file_operation.pFrom = double_terminated_path;
-  file_operation.fFlags = FOF_ALLOWUNDO;
+  file_operation.fFlags = FOF_ALLOWUNDO | FOF_SILENT | FOF_NOCONFIRMATION;
   SHFileOperation(&file_operation);
 }
 

docs/api/browser-window.md

@@ -239,6 +239,10 @@ Maximizes the window.
 
 Unmaximizes the window.
 
+### BrowserWindow.isMaximized()
+
+Returns whether the window is maximized.
+
 ### BrowserWindow.minimize()
 
 Minimizes the window. On some platforms the minimized window will be shown in
@@ -394,6 +398,10 @@ Opens the developer tools.
 
 Closes the developer tools.
 
+### BrowserWindow.toggleDevTools()
+
+Toggle the developer tools.
+
 ### BrowserWindow.inspectElement(x, y)
 
 * `x` Integer

docs/api/screen.md

@@ -1,6 +1,12 @@
 # screen
 
 Gets various info about screen size, displays, cursor position, etc.
+```js
+var Screen = require('screen');
+var BrowserWindow = require('browser-window');
+var size = Screen.getPrimaryDisplay().workAreaSize;
+mainWindow = new BrowserWindow({ width: size.width, height: size.height });
+```
 
 ## screen.getCursorScreenPoint()