| OLD | NEW |
| 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/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser_dialogs.h" | 9 #include "chrome/browser/ui/browser_dialogs.h" |
| 10 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
| 11 #include "chrome/browser/ui/browser_list.h" | 11 #include "chrome/browser/ui/browser_list.h" |
| 12 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
| 13 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" | 13 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" |
| 14 #include "chrome/browser/ui/views/constrained_window_views.h" | 14 #include "chrome/browser/ui/views/constrained_window_views.h" |
| 15 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | |
| 16 #include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h" | |
| 17 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 17 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "content/public/browser/web_contents_view.h" | 19 #include "content/public/browser/web_contents_view.h" |
| 20 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/views/controls/message_box_view.h" | 22 #include "ui/views/controls/message_box_view.h" |
| 23 #include "ui/views/widget/widget.h" | 23 #include "ui/views/widget/widget.h" |
| 24 #include "ui/views/window/dialog_client_view.h" | 24 #include "ui/views/window/dialog_client_view.h" |
| 25 | 25 |
| 26 using web_modal::WebContentsModalDialogManager; |
| 27 |
| 26 namespace { | 28 namespace { |
| 27 | 29 |
| 28 views::MessageBoxView::InitParams GetInitParams( | 30 views::MessageBoxView::InitParams GetInitParams( |
| 29 const string16& message, | 31 const string16& message, |
| 30 content::WebContents* web_contents) { | 32 content::WebContents* web_contents) { |
| 31 views::MessageBoxView::InitParams params(message); | 33 views::MessageBoxView::InitParams params(message); |
| 32 if (web_contents) { | 34 if (web_contents) { |
| 33 if (Browser* browser = chrome::FindBrowserWithWebContents(web_contents)) { | 35 if (Browser* browser = chrome::FindBrowserWithWebContents(web_contents)) { |
| 34 params.clipboard_source_tag = | 36 params.clipboard_source_tag = |
| 35 content::BrowserContext::GetMarkerForOffTheRecordContext( | 37 content::BrowserContext::GetMarkerForOffTheRecordContext( |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 delete this; | 140 delete this; |
| 139 } | 141 } |
| 140 | 142 |
| 141 ui::ModalType TabModalConfirmDialogViews::GetModalType() const { | 143 ui::ModalType TabModalConfirmDialogViews::GetModalType() const { |
| 142 #if defined(USE_ASH) | 144 #if defined(USE_ASH) |
| 143 return ui::MODAL_TYPE_CHILD; | 145 return ui::MODAL_TYPE_CHILD; |
| 144 #else | 146 #else |
| 145 return views::WidgetDelegate::GetModalType(); | 147 return views::WidgetDelegate::GetModalType(); |
| 146 #endif | 148 #endif |
| 147 } | 149 } |
| OLD | NEW |