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/views/window.h" | 5 #include "chrome/browser/ui/views/window.h" |
6 | 6 |
7 #include "views/widget/widget.h" | 7 #include "views/widget/widget.h" |
8 | 8 |
9 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | |
10 #include "chrome/browser/chromeos/frame/bubble_window.h" | |
11 #endif // defined(OS_CHROMEOS) | |
12 | |
13 namespace browser { | 9 namespace browser { |
14 | 10 |
15 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, | 11 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, |
16 views::WidgetDelegate* delegate) { | 12 views::WidgetDelegate* delegate, |
| 13 chromeos::BubbleWindowStyle style) { |
17 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 14 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
18 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL | 15 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL |
19 // for crbug.com/98322 is landed. | 16 // for crbug.com/98322 is landed. |
20 return chromeos::BubbleWindow::Create(parent, | 17 return chromeos::BubbleWindow::Create(parent, style, delegate); |
21 chromeos::STYLE_GENERIC, delegate); | |
22 #else | 18 #else |
23 return views::Widget::CreateWindowWithParent(delegate, parent); | 19 return views::Widget::CreateWindowWithParent(delegate, parent); |
24 #endif | 20 #endif |
25 } | 21 } |
26 | 22 |
27 } // namespace browser | 23 } // namespace browser |
OLD | NEW |