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

Side by Side Diff: ui/views/controls/menu/menu_scroll_view_container.h

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Further renaming Created 6 years, 11 months 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_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
7 7
8 #include "ui/views/view.h" 8 #include "ui/views/view.h"
9 #include "ui/views/bubble/bubble_border.h" 9 #include "ui/views/bubble/bubble_border.h"
10 #include "ui/views/controls/menu/menu_item_view.h" 10 #include "ui/views/controls/menu/menu_item_view.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 // The scroll view. 59 // The scroll view.
60 MenuScrollView* scroll_view_; 60 MenuScrollView* scroll_view_;
61 61
62 // The content view. 62 // The content view.
63 SubmenuView* content_view_; 63 SubmenuView* content_view_;
64 64
65 // If set the currently set border is a bubble border. 65 // If set the currently set border is a bubble border.
66 BubbleBorder::Arrow arrow_; 66 BubbleBorder::Arrow arrow_;
67 67
68 // The currently set border. 68 // Weak reference to the currently set border.
69 BubbleBorder* bubble_border_; 69 BubbleBorder* bubble_border_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer); 71 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer);
72 }; 72 };
73 73
74 } // namespace views 74 } // namespace views
75 75
76 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ 76 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698