mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove duplicate UpdateDraggableRegions

Browse source
This commit is contained in:
Cheng Zhao 2015-08-05 12:32:22 +08:00
parent 6b65a66119
commit 58c0486236
6 changed files with 43 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/native_window_mac.h
View file

@ -11,13 +11,11 @@
#include <vector>
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "atom/browser/native_window.h"
@class AtomNSWindow;
@class AtomNSWindowDelegate;
@class FullSizeContentView;
class SkRegion;
namespace atom {
@ -88,9 +86,6 @@ class NativeWindowMac : public NativeWindow {
void ClipWebView();
protected:
void UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) override;
// NativeWindow:
void HandleKeyboardEvent(
content::WebContents*,
@ -117,10 +112,6 @@ class NativeWindowMac : public NativeWindow {
// The presentation options before entering kiosk mode.
NSApplicationPresentationOptions kiosk_options_;
// For custom drag, the whole window is non-draggable and the draggable region
// has to been explicitly provided.
scoped_ptr<SkRegion> draggable_region_; // used in custom drag.
// Mouse location since the last mouse event, in screen coordinates. This is
// used in custom drag to compute the window movement.
NSPoint last_mouse_offset_;