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

Side by Side Diff: views/widget/widget_delegate.cc

Issue 7189019: Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 #include "views/widget/widget_delegate.h" 5 #include "views/widget/widget_delegate.h"
6 6
7 #include "views/view.h" 7 #include "views/view.h"
8 #include "views/views_delegate.h" 8 #include "views/views_delegate.h"
9 #include "views/widget/widget.h" 9 #include "views/widget/widget.h"
10 #include "views/window/client_view.h" 10 #include "views/window/client_view.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 return false; 125 return false;
126 126
127 return ViewsDelegate::views_delegate->GetSavedMaximizedState( 127 return ViewsDelegate::views_delegate->GetSavedMaximizedState(
128 GetWidget(), window_name, maximized); 128 GetWidget(), window_name, maximized);
129 } 129 }
130 130
131 bool WidgetDelegate::ShouldRestoreWindowSize() const { 131 bool WidgetDelegate::ShouldRestoreWindowSize() const {
132 return true; 132 return true;
133 } 133 }
134 134
135 Widget* WidgetDelegate::GetWidget() {
136 return NULL;
137 }
138
139 const Widget* WidgetDelegate::GetWidget() const {
140 return NULL;
141 }
142
143 View* WidgetDelegate::GetContentsView() { 135 View* WidgetDelegate::GetContentsView() {
144 if (!default_contents_view_) 136 if (!default_contents_view_)
145 default_contents_view_ = new View; 137 default_contents_view_ = new View;
146 return default_contents_view_; 138 return default_contents_view_;
147 } 139 }
148 140
149 ClientView* WidgetDelegate::CreateClientView(Widget* widget) { 141 ClientView* WidgetDelegate::CreateClientView(Widget* widget) {
150 return new ClientView(widget, GetContentsView()); 142 return new ClientView(widget, GetContentsView());
151 } 143 }
152 144
(...skipping 17 matching lines...) Expand all
170 Widget* WidgetDelegateView::GetWidget() { 162 Widget* WidgetDelegateView::GetWidget() {
171 return View::GetWidget(); 163 return View::GetWidget();
172 } 164 }
173 165
174 const Widget* WidgetDelegateView::GetWidget() const { 166 const Widget* WidgetDelegateView::GetWidget() const {
175 return View::GetWidget(); 167 return View::GetWidget();
176 } 168 }
177 169
178 } // namespace views 170 } // namespace views
179 171
OLDNEW
« chrome/browser/ui/views/default_search_view.h ('K') | « views/widget/widget_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698