OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/webui/constrained_html_ui.h" | 5 #include "chrome/browser/ui/webui/constrained_html_ui.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/tab_contents/tab_contents_wrapper.h" | 9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
10 #include "chrome/browser/ui/views/constrained_window_views.h" | 10 #include "chrome/browser/ui/views/constrained_window_views.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 Profile* profile, | 122 Profile* profile, |
123 HtmlDialogUIDelegate* delegate, | 123 HtmlDialogUIDelegate* delegate, |
124 TabContentsWrapper* container) { | 124 TabContentsWrapper* container) { |
125 #if defined(USE_AURA) | 125 #if defined(USE_AURA) |
126 // TODO(saintlou): Another atrocious hack until we get PureView version. | 126 // TODO(saintlou): Another atrocious hack until we get PureView version. |
127 return NULL; | 127 return NULL; |
128 #else | 128 #else |
129 ConstrainedHtmlDelegateViews* constrained_delegate = | 129 ConstrainedHtmlDelegateViews* constrained_delegate = |
130 new ConstrainedHtmlDelegateViews(profile, delegate); | 130 new ConstrainedHtmlDelegateViews(profile, delegate); |
131 ConstrainedWindow* constrained_window = | 131 ConstrainedWindow* constrained_window = |
132 new ConstrainedWindowViews(container->tab_contents(), | 132 new ConstrainedWindowViews(container, constrained_delegate); |
133 constrained_delegate); | |
134 constrained_delegate->set_window(constrained_window); | 133 constrained_delegate->set_window(constrained_window); |
135 return constrained_window; | 134 return constrained_window; |
136 #endif | 135 #endif |
137 } | 136 } |
OLD | NEW |