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

Side by Side Diff: ui/views/widget/widget_delegate.h

Issue 11953066: Reland 179231 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DesktopBackgroundView leak Created 7 years, 10 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
« no previous file with comments | « ui/views/test/child_modal_window.cc ('k') | ui/views/widget/widget_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WIDGET_WIDGET_DELEGATE_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
6 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/base/accessibility/accessibility_types.h" 10 #include "ui/base/accessibility/accessibility_types.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 virtual ~WidgetDelegate() {} 157 virtual ~WidgetDelegate() {}
158 158
159 private: 159 private:
160 View* default_contents_view_; 160 View* default_contents_view_;
161 161
162 DISALLOW_COPY_AND_ASSIGN(WidgetDelegate); 162 DISALLOW_COPY_AND_ASSIGN(WidgetDelegate);
163 }; 163 };
164 164
165 // A WidgetDelegate implementation that is-a View. Used to override GetWidget() 165 // A WidgetDelegate implementation that is-a View. Used to override GetWidget()
166 // to call View's GetWidget() for the common case where a WidgetDelegate 166 // to call View's GetWidget() for the common case where a WidgetDelegate
167 // implementation is-a View. 167 // implementation is-a View. Note that WidgetDelegateView is not owned by
168 // view's hierarchy and is expected to be deleted on DeleteDelegate call.
168 class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View { 169 class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
169 public: 170 public:
170 WidgetDelegateView(); 171 WidgetDelegateView();
171 virtual ~WidgetDelegateView(); 172 virtual ~WidgetDelegateView();
172 173
173 // Overridden from WidgetDelegate: 174 // Overridden from WidgetDelegate:
175 virtual void DeleteDelegate() OVERRIDE;
174 virtual Widget* GetWidget() OVERRIDE; 176 virtual Widget* GetWidget() OVERRIDE;
175 virtual const Widget* GetWidget() const OVERRIDE; 177 virtual const Widget* GetWidget() const OVERRIDE;
176 178
177 private: 179 private:
178 DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView); 180 DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView);
179 }; 181 };
180 182
181 } // namespace views 183 } // namespace views
182 184
183 #endif // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_ 185 #endif // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views/test/child_modal_window.cc ('k') | ui/views/widget/widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698