| Index: chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
|
| index 4c93bd007e3e0c8c09cf6e5950ba9d6739382475..763c0bec831b7aa10a530f81ee82092ca902eeba 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
|
| @@ -22,7 +22,6 @@ class ExtensionKeybindingRegistryCocoa;
|
| class Profile;
|
| class ShellWindowCocoa;
|
| @class ShellNSWindow;
|
| -class SkRegion;
|
|
|
| // A window controller for a minimal window to host a web app view. Passes
|
| // Objective-C notifications to the C++ bridge.
|
| @@ -93,7 +92,6 @@ class ShellWindowCocoa : public NativeShellWindow {
|
| void HandleMouseEvent(NSEvent* event);
|
|
|
| bool use_system_drag() const { return use_system_drag_; }
|
| - SkRegion* draggable_region() const { return draggable_region_.get(); }
|
|
|
| protected:
|
| // NativeShellWindow implementation.
|
| @@ -103,8 +101,6 @@ class ShellWindowCocoa : public NativeShellWindow {
|
| virtual void UpdateWindowTitle() OVERRIDE;
|
| virtual void UpdateDraggableRegions(
|
| const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
|
| - virtual void UpdateLegacyDraggableRegions(
|
| - const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
|
| virtual void HandleKeyboardEvent(
|
| const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
|
|
| @@ -131,8 +127,6 @@ class ShellWindowCocoa : public NativeShellWindow {
|
|
|
| ShellWindow* shell_window_; // weak - ShellWindow owns NativeShellWindow.
|
|
|
| - bool has_frame_;
|
| -
|
| bool is_fullscreen_;
|
| NSRect restored_bounds_;
|
|
|
| @@ -147,10 +141,6 @@ class ShellWindowCocoa : public NativeShellWindow {
|
| // have to been explicitly excluded.
|
| std::vector<gfx::Rect> system_drag_exclude_areas_;
|
|
|
| - // 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_location_;
|
|
|