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

Side by Side Diff: ui/views/bubble/bubble_frame_view.h

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ 5 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
6 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ 6 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "ui/views/bubble/bubble_border.h" 10 #include "ui/views/bubble/bubble_border.h"
(...skipping 14 matching lines...) Expand all
25 bool allow_bubble_offscreen); 25 bool allow_bubble_offscreen);
26 virtual ~BubbleFrameView(); 26 virtual ~BubbleFrameView();
27 27
28 // NonClientFrameView overrides: 28 // NonClientFrameView overrides:
29 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 29 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
30 virtual gfx::Rect GetWindowBoundsForClientBounds( 30 virtual gfx::Rect GetWindowBoundsForClientBounds(
31 const gfx::Rect& client_bounds) const OVERRIDE; 31 const gfx::Rect& client_bounds) const OVERRIDE;
32 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 32 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
33 virtual void GetWindowMask(const gfx::Size& size, 33 virtual void GetWindowMask(const gfx::Size& size,
34 gfx::Path* window_mask) OVERRIDE {} 34 gfx::Path* window_mask) OVERRIDE {}
35 virtual void EnableClose(bool enable) OVERRIDE {}
35 virtual void ResetWindowControls() OVERRIDE {} 36 virtual void ResetWindowControls() OVERRIDE {}
36 virtual void UpdateWindowIcon() OVERRIDE {} 37 virtual void UpdateWindowIcon() OVERRIDE {}
37 38
38 // View overrides: 39 // View overrides:
39 virtual gfx::Size GetPreferredSize() OVERRIDE; 40 virtual gfx::Size GetPreferredSize() OVERRIDE;
40 41
41 // Accessor for bubble border inside border contents. 42 // Accessor for bubble border inside border contents.
42 BubbleBorder* bubble_border() const; 43 BubbleBorder* bubble_border() const;
43 44
44 private: 45 private:
45 FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, GetBoundsForClientView); 46 FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, GetBoundsForClientView);
46 47
47 BorderContentsView* border_contents_; 48 BorderContentsView* border_contents_;
48 BubbleBorder::ArrowLocation location_; 49 BubbleBorder::ArrowLocation location_;
49 bool allow_bubble_offscreen_; 50 bool allow_bubble_offscreen_;
50 51
51 DISALLOW_COPY_AND_ASSIGN(BubbleFrameView); 52 DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
52 }; 53 };
53 54
54 } // namespace views 55 } // namespace views
55 56
56 #endif // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ 57 #endif // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698