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

Side by Side Diff: chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc

Issue 109623005: Cleanup: Remove deprecated version of views::CreateDialogFrameView(). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix nits Created 6 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
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 "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h" 5 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/browser_dialogs.h" 8 #include "chrome/browser/ui/browser_dialogs.h"
9 #include "chrome/browser/ui/browser_list.h" 9 #include "chrome/browser/ui/browser_list.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" 11 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
12 #include "chrome/browser/ui/views/constrained_window_views.h"
13 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
14 #include "components/web_modal/web_contents_modal_dialog_host.h" 13 #include "components/web_modal/web_contents_modal_dialog_host.h"
15 #include "components/web_modal/web_contents_modal_dialog_manager.h" 14 #include "components/web_modal/web_contents_modal_dialog_manager.h"
16 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" 15 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
17 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/window_open_disposition.h" 19 #include "ui/base/window_open_disposition.h"
21 #include "ui/views/controls/message_box_view.h" 20 #include "ui/views/controls/message_box_view.h"
22 #include "ui/views/layout/layout_constants.h" 21 #include "ui/views/layout/layout_constants.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return true; 116 return true;
118 } 117 }
119 118
120 /////////////////////////////////////////////////////////////////////////////// 119 ///////////////////////////////////////////////////////////////////////////////
121 // TabModalConfirmDialogViews, views::WidgetDelegate implementation: 120 // TabModalConfirmDialogViews, views::WidgetDelegate implementation:
122 121
123 views::View* TabModalConfirmDialogViews::GetContentsView() { 122 views::View* TabModalConfirmDialogViews::GetContentsView() {
124 return message_box_view_; 123 return message_box_view_;
125 } 124 }
126 125
127 // TODO(wittman): Remove this override once we move to the new style frame view
128 // on all dialogs.
129 views::NonClientFrameView* TabModalConfirmDialogViews::CreateNonClientFrameView(
130 views::Widget* widget) {
131 return CreateConstrainedStyleNonClientFrameView(widget, browser_context_);
132 }
133
134 views::Widget* TabModalConfirmDialogViews::GetWidget() { 126 views::Widget* TabModalConfirmDialogViews::GetWidget() {
135 return message_box_view_->GetWidget(); 127 return message_box_view_->GetWidget();
136 } 128 }
137 129
138 const views::Widget* TabModalConfirmDialogViews::GetWidget() const { 130 const views::Widget* TabModalConfirmDialogViews::GetWidget() const {
139 return message_box_view_->GetWidget(); 131 return message_box_view_->GetWidget();
140 } 132 }
141 133
142 void TabModalConfirmDialogViews::DeleteDelegate() { 134 void TabModalConfirmDialogViews::DeleteDelegate() {
143 delete this; 135 delete this;
144 } 136 }
145 137
146 ui::ModalType TabModalConfirmDialogViews::GetModalType() const { 138 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {
147 #if defined(USE_ASH) 139 #if defined(USE_ASH)
148 return ui::MODAL_TYPE_CHILD; 140 return ui::MODAL_TYPE_CHILD;
149 #else 141 #else
150 return views::WidgetDelegate::GetModalType(); 142 return views::WidgetDelegate::GetModalType();
151 #endif 143 #endif
152 } 144 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698