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

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

Issue 11044020: Make Web Intents picker in Views conform to latest mocks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Include changes from CL 11077006 Created 8 years, 2 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
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 #include "ui/views/widget/widget_delegate.h" 5 #include "ui/views/widget/widget_delegate.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/bubble/bubble_delegate.h" 9 #include "ui/views/bubble/bubble_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool WidgetDelegate::ShouldRestoreWindowSize() const { 123 bool WidgetDelegate::ShouldRestoreWindowSize() const {
124 return true; 124 return true;
125 } 125 }
126 126
127 View* WidgetDelegate::GetContentsView() { 127 View* WidgetDelegate::GetContentsView() {
128 if (!default_contents_view_) 128 if (!default_contents_view_)
129 default_contents_view_ = new View; 129 default_contents_view_ = new View;
130 return default_contents_view_; 130 return default_contents_view_;
131 } 131 }
132 132
133 View* WidgetDelegate::GetHeaderView() {
134 return NULL;
135 }
136
133 ClientView* WidgetDelegate::CreateClientView(Widget* widget) { 137 ClientView* WidgetDelegate::CreateClientView(Widget* widget) {
134 return new ClientView(widget, GetContentsView()); 138 return new ClientView(widget, GetContentsView());
135 } 139 }
136 140
137 NonClientFrameView* WidgetDelegate::CreateNonClientFrameView(Widget* widget) { 141 NonClientFrameView* WidgetDelegate::CreateNonClientFrameView(Widget* widget) {
138 return NULL; 142 return NULL;
139 } 143 }
140 144
141 bool WidgetDelegate::WillProcessWorkAreaChange() const { 145 bool WidgetDelegate::WillProcessWorkAreaChange() const {
142 return false; 146 return false;
(...skipping 24 matching lines...) Expand all
167 171
168 Widget* WidgetDelegateView::GetWidget() { 172 Widget* WidgetDelegateView::GetWidget() {
169 return View::GetWidget(); 173 return View::GetWidget();
170 } 174 }
171 175
172 const Widget* WidgetDelegateView::GetWidget() const { 176 const Widget* WidgetDelegateView::GetWidget() const {
173 return View::GetWidget(); 177 return View::GetWidget();
174 } 178 }
175 179
176 } // namespace views 180 } // namespace views
OLDNEW
« chrome/browser/ui/views/web_intent_picker_views.cc ('K') | « ui/views/widget/widget_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698