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

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

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore [D]CHECKs and loop scoping. Created 7 years, 1 month 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" 12 #include "chrome/browser/ui/views/constrained_window_views.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "components/web_modal/web_contents_modal_dialog_host.h" 14 #include "components/web_modal/web_contents_modal_dialog_host.h"
15 #include "components/web_modal/web_contents_modal_dialog_manager.h" 15 #include "components/web_modal/web_contents_modal_dialog_manager.h"
16 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" 16 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "content/public/browser/web_contents_view.h"
19 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/base/window_open_disposition.h" 20 #include "ui/base/window_open_disposition.h"
22 #include "ui/views/controls/message_box_view.h" 21 #include "ui/views/controls/message_box_view.h"
23 #include "ui/views/layout/layout_constants.h" 22 #include "ui/views/layout/layout_constants.h"
24 #include "ui/views/widget/widget.h" 23 #include "ui/views/widget/widget.h"
25 #include "ui/views/window/dialog_client_view.h" 24 #include "ui/views/window/dialog_client_view.h"
26 25
27 using web_modal::WebContentsModalDialogManager; 26 using web_modal::WebContentsModalDialogManager;
28 using web_modal::WebContentsModalDialogManagerDelegate; 27 using web_modal::WebContentsModalDialogManagerDelegate;
(...skipping 23 matching lines...) Expand all
52 string16 link_text(delegate->GetLinkText()); 51 string16 link_text(delegate->GetLinkText());
53 if (!link_text.empty()) 52 if (!link_text.empty())
54 message_box_view_->SetLink(link_text, this); 53 message_box_view_->SetLink(link_text, this);
55 54
56 WebContentsModalDialogManager* web_contents_modal_dialog_manager = 55 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
57 WebContentsModalDialogManager::FromWebContents(web_contents); 56 WebContentsModalDialogManager::FromWebContents(web_contents);
58 WebContentsModalDialogManagerDelegate* modal_delegate = 57 WebContentsModalDialogManagerDelegate* modal_delegate =
59 web_contents_modal_dialog_manager->delegate(); 58 web_contents_modal_dialog_manager->delegate();
60 DCHECK(modal_delegate); 59 DCHECK(modal_delegate);
61 dialog_ = views::Widget::CreateWindowAsFramelessChild( 60 dialog_ = views::Widget::CreateWindowAsFramelessChild(
62 this, 61 this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
63 web_contents->GetView()->GetNativeView(),
64 modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
65 web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView()); 62 web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView());
66 delegate_->set_close_delegate(this); 63 delegate_->set_close_delegate(this);
67 } 64 }
68 65
69 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() { 66 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
70 } 67 }
71 68
72 void TabModalConfirmDialogViews::AcceptTabModalDialog() { 69 void TabModalConfirmDialogViews::AcceptTabModalDialog() {
73 GetDialogClientView()->AcceptWindow(); 70 GetDialogClientView()->AcceptWindow();
74 } 71 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 delete this; 143 delete this;
147 } 144 }
148 145
149 ui::ModalType TabModalConfirmDialogViews::GetModalType() const { 146 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {
150 #if defined(USE_ASH) 147 #if defined(USE_ASH)
151 return ui::MODAL_TYPE_CHILD; 148 return ui::MODAL_TYPE_CHILD;
152 #else 149 #else
153 return views::WidgetDelegate::GetModalType(); 150 return views::WidgetDelegate::GetModalType();
154 #endif 151 #endif
155 } 152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698