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

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

Issue 287123002: [WebModals] New API for browser-scoped popup management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make PopupManager a thin API for WCMDM Created 6 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) 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"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 dialog_(NULL) { 43 dialog_(NULL) {
44 views::MessageBoxView::InitParams init_params(delegate->GetDialogMessage()); 44 views::MessageBoxView::InitParams init_params(delegate->GetDialogMessage());
45 init_params.inter_row_vertical_spacing = 45 init_params.inter_row_vertical_spacing =
46 views::kUnrelatedControlVerticalSpacing; 46 views::kUnrelatedControlVerticalSpacing;
47 message_box_view_ = new views::MessageBoxView(init_params); 47 message_box_view_ = new views::MessageBoxView(init_params);
48 48
49 base::string16 link_text(delegate->GetLinkText()); 49 base::string16 link_text(delegate->GetLinkText());
50 if (!link_text.empty()) 50 if (!link_text.empty())
51 message_box_view_->SetLink(link_text, this); 51 message_box_view_->SetLink(link_text, this);
52 52
53 // TODO(gbillock): Use PopupManager here.
53 WebContentsModalDialogManager* web_contents_modal_dialog_manager = 54 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
54 WebContentsModalDialogManager::FromWebContents(web_contents); 55 WebContentsModalDialogManager::FromWebContents(web_contents);
55 WebContentsModalDialogManagerDelegate* modal_delegate = 56 WebContentsModalDialogManagerDelegate* modal_delegate =
56 web_contents_modal_dialog_manager->delegate(); 57 web_contents_modal_dialog_manager->delegate();
57 DCHECK(modal_delegate); 58 DCHECK(modal_delegate);
58 dialog_ = views::Widget::CreateWindowAsFramelessChild( 59 dialog_ = views::Widget::CreateWindowAsFramelessChild(
59 this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView()); 60 this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
60 web_contents_modal_dialog_manager->ShowModalDialog( 61 web_contents_modal_dialog_manager->ShowModalDialog(
61 dialog_->GetNativeView()); 62 dialog_->GetNativeView());
62 delegate_->set_close_delegate(this); 63 delegate_->set_close_delegate(this);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 delete this; 136 delete this;
136 } 137 }
137 138
138 ui::ModalType TabModalConfirmDialogViews::GetModalType() const { 139 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {
139 #if defined(USE_ASH) 140 #if defined(USE_ASH)
140 return ui::MODAL_TYPE_CHILD; 141 return ui::MODAL_TYPE_CHILD;
141 #else 142 #else
142 return views::WidgetDelegate::GetModalType(); 143 return views::WidgetDelegate::GetModalType();
143 #endif 144 #endif
144 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698