Index: chrome/browser/views/frame/browser_frame_gtk.cc |
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc |
index b7d9689c626573e2f6e7d966bd543e508d406420..5b66885bb895a46b3c171b2f5fd89051341a62f0 100644 |
--- a/chrome/browser/views/frame/browser_frame_gtk.cc |
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc |
@@ -12,50 +12,11 @@ |
#include "chrome/browser/views/frame/browser_root_view.h" |
#include "chrome/browser/views/frame/browser_view.h" |
#include "chrome/browser/views/frame/opaque_browser_frame_view.h" |
+#include "chrome/browser/views/frame/popup_non_client_frame_view.h" |
#include "gfx/font.h" |
#include "views/widget/root_view.h" |
#include "views/window/hit_test.h" |
-namespace { |
- |
-// BrowserNonClientFrameView implementation for popups. We let the window |
-// manager implementation render the decorations for popups, so this draws |
-// nothing. |
-class PopupNonClientFrameView : public BrowserNonClientFrameView { |
- public: |
- PopupNonClientFrameView() { |
- } |
- |
- // NonClientFrameView: |
- virtual gfx::Rect GetBoundsForClientView() const { |
- return gfx::Rect(0, 0, width(), height()); |
- } |
- virtual bool AlwaysUseCustomFrame() const { return false; } |
- virtual bool AlwaysUseNativeFrame() const { return true; } |
- virtual gfx::Rect GetWindowBoundsForClientBounds( |
- const gfx::Rect& client_bounds) const { |
- return client_bounds; |
- } |
- virtual int NonClientHitTest(const gfx::Point& point) { |
- return bounds().Contains(point) ? HTCLIENT : HTNOWHERE; |
- } |
- virtual void GetWindowMask(const gfx::Size& size, |
- gfx::Path* window_mask) {} |
- virtual void EnableClose(bool enable) {} |
- virtual void ResetWindowControls() {} |
- |
- // BrowserNonClientFrameView: |
- virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const { |
- return gfx::Rect(0, 0, width(), tabstrip->GetPreferredHeight()); |
- } |
- virtual void UpdateThrobber(bool running) {} |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(PopupNonClientFrameView); |
-}; |
- |
-} |
- |
#if !defined(OS_CHROMEOS) |
// static (Factory method.) |
BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, |