Index: views/window/native_frame_view.h |
diff --git a/views/window/native_frame_view.h b/views/window/native_frame_view.h |
index 2073def4a3d771f1a88982497041c417015523cf..0228a2c57b99ad05294daf3fc3e1740b4b8fb2c5 100644 |
--- a/views/window/native_frame_view.h |
+++ b/views/window/native_frame_view.h |
@@ -6,43 +6,7 @@ |
#define VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ |
#pragma once |
-#include "views/window/non_client_view.h" |
+#include "ui/views/window/native_frame_view.h" |
+// TODO(tfarina): remove this file once all includes have been updated. |
-namespace views { |
- |
-class Widget; |
- |
-class VIEWS_EXPORT NativeFrameView : public NonClientFrameView { |
- public: |
- explicit NativeFrameView(Widget* frame); |
- virtual ~NativeFrameView(); |
- |
- // NonClientFrameView overrides: |
- virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; |
- virtual gfx::Rect GetWindowBoundsForClientBounds( |
- const gfx::Rect& client_bounds) const OVERRIDE; |
- virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; |
- virtual void GetWindowMask(const gfx::Size& size, |
- gfx::Path* window_mask) OVERRIDE; |
- virtual void EnableClose(bool enable) OVERRIDE; |
- virtual void ResetWindowControls() OVERRIDE; |
- virtual void UpdateWindowIcon() OVERRIDE; |
- |
- // View overrides: |
- |
- // Returns the client size. On Windows, this is the expected behavior for |
- // native frames (see |NativeWidgetWin::WidgetSizeIsClientSize()|), while |
- // other platforms currently always return client bounds from |
- // |GetWindowBoundsForClientBounds()|. |
- virtual gfx::Size GetPreferredSize() OVERRIDE; |
- |
- private: |
- // Our containing frame. |
- Widget* frame_; |
- |
- DISALLOW_COPY_AND_ASSIGN(NativeFrameView); |
-}; |
- |
-} // namespace views |
- |
-#endif // #ifndef VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ |
+#endif // VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ |