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/window/dialog_delegate.cc

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test fixes 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 | Annotate | Revision Log
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/window/dialog_delegate.h" 5 #include "ui/views/window/dialog_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/views/controls/button/text_button.h" 8 #include "ui/views/controls/button/text_button.h"
9 #include "ui/views/widget/widget.h" 9 #include "ui/views/widget/widget.h"
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 82 }
83 83
84 if (default_button & ui::DIALOG_BUTTON_OK) 84 if (default_button & ui::DIALOG_BUTTON_OK)
85 return dcv->ok_button(); 85 return dcv->ok_button();
86 if (default_button & ui::DIALOG_BUTTON_CANCEL) 86 if (default_button & ui::DIALOG_BUTTON_CANCEL)
87 return dcv->cancel_button(); 87 return dcv->cancel_button();
88 return NULL; 88 return NULL;
89 } 89 }
90 90
91 ClientView* DialogDelegate::CreateClientView(Widget* widget) { 91 ClientView* DialogDelegate::CreateClientView(Widget* widget) {
92 return new DialogClientView(widget, GetContentsView()); 92 return new DialogClientView(widget, GetContentsView(),
93 DialogClientView::StyleParams());
93 } 94 }
94 95
95 const DialogClientView* DialogDelegate::GetDialogClientView() const { 96 const DialogClientView* DialogDelegate::GetDialogClientView() const {
96 return GetWidget()->client_view()->AsDialogClientView(); 97 return GetWidget()->client_view()->AsDialogClientView();
97 } 98 }
98 99
99 DialogClientView* DialogDelegate::GetDialogClientView() { 100 DialogClientView* DialogDelegate::GetDialogClientView() {
100 return GetWidget()->client_view()->AsDialogClientView(); 101 return GetWidget()->client_view()->AsDialogClientView();
101 } 102 }
102 103
(...skipping 12 matching lines...) Expand all
115 116
116 Widget* DialogDelegateView::GetWidget() { 117 Widget* DialogDelegateView::GetWidget() {
117 return View::GetWidget(); 118 return View::GetWidget();
118 } 119 }
119 120
120 const Widget* DialogDelegateView::GetWidget() const { 121 const Widget* DialogDelegateView::GetWidget() const {
121 return View::GetWidget(); 122 return View::GetWidget();
122 } 123 }
123 124
124 } // namespace views 125 } // namespace views
OLDNEW
« ui/views/controls/button/text_button.cc ('K') | « ui/views/window/dialog_client_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698