Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Unified Diff: views/bubble/bubble_frame_view.h

Issue 8588064: views: Move bubble, events, focus and layout to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/bubble/bubble_delegate_unittest.cc ('k') | views/bubble/bubble_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/bubble/bubble_frame_view.h
diff --git a/views/bubble/bubble_frame_view.h b/views/bubble/bubble_frame_view.h
index 1e3cbdaabcaf141806203a10a0e4cf06f5826d8c..268e1a2fd9fc332f30d5ab39fe68d7b1af0b37ae 100644
--- a/views/bubble/bubble_frame_view.h
+++ b/views/bubble/bubble_frame_view.h
@@ -6,52 +6,7 @@
#define VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
#pragma once
-#include "base/gtest_prod_util.h"
-#include "ui/views/window/non_client_view.h"
-#include "views/bubble/bubble_border.h"
-
-namespace views {
-
-class BorderContentsView;
-
-// BubbleFrameView to render BubbleBorder.
-//
-////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView {
- public:
- BubbleFrameView(BubbleBorder::ArrowLocation location,
- const gfx::Size& client_size,
- SkColor color,
- bool allow_bubble_offscreen);
- virtual ~BubbleFrameView();
-
- // 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:
- virtual gfx::Size GetPreferredSize() OVERRIDE;
-
- // Accessor for bubble border inside border contents.
- BubbleBorder* bubble_border() const;
-
- private:
- FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, GetBoundsForClientView);
-
- BorderContentsView* border_contents_;
- BubbleBorder::ArrowLocation location_;
- bool allow_bubble_offscreen_;
-
- DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
-};
-
-} // namespace views
+#include "ui/views/bubble/bubble_frame_view.h"
+// TODO(tfarina): remove this file once all includes have been updated.
#endif // VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
« no previous file with comments | « views/bubble/bubble_delegate_unittest.cc ('k') | views/bubble/bubble_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698