Chromium Code Reviews| 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/constrained_window_views.h" | 5 #include "chrome/browser/ui/views/constrained_window_views.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "components/web_modal/web_contents_modal_dialog_host.h" | 10 #include "components/web_modal/web_contents_modal_dialog_host.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); | 132 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); |
| 133 DCHECK_EQ(parent, host->GetHostView()); | 133 DCHECK_EQ(parent, host->GetHostView()); |
| 134 ModalDialogHostObserver* dialog_host_observer = | 134 ModalDialogHostObserver* dialog_host_observer = |
| 135 new BrowserModalDialogHostObserverViews( | 135 new BrowserModalDialogHostObserverViews( |
| 136 host, widget, kBrowserModalDialogHostObserverViewsKey); | 136 host, widget, kBrowserModalDialogHostObserverViewsKey); |
| 137 dialog_host_observer->OnPositionRequiresUpdate(); | 137 dialog_host_observer->OnPositionRequiresUpdate(); |
| 138 } | 138 } |
| 139 return widget; | 139 return widget; |
| 140 } | 140 } |
| 141 | 141 |
| 142 views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView( | 142 views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView( |
|
Mike Wittman
2013/12/11 15:09:18
This function can be removed entirely, as well as
Lei Zhang
2014/02/07 00:03:41
Done.
| |
| 143 views::Widget* widget, | 143 views::Widget* widget, |
| 144 content::BrowserContext* browser_context) { | 144 content::BrowserContext* /* browser_context */) { |
| 145 bool force_opaque = true; | 145 return views::DialogDelegate::CreateDialogFrameView(widget); |
| 146 #if defined(USE_AURA) | |
| 147 force_opaque = false; | |
| 148 #endif | |
| 149 return views::DialogDelegate::CreateDialogFrameView(widget, force_opaque); | |
| 150 } | 146 } |
| OLD | NEW |