Chromium Code Reviews| 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 "ui/views/bubble/bubble_delegate.h" | |
| 7 #include "views/widget/widget.h" | 8 #include "views/widget/widget.h" |
| 8 | 9 |
| 9 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 10 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 10 #include "chrome/browser/chromeos/frame/bubble_window.h" | 11 #include "chrome/browser/chromeos/frame/bubble_window.h" |
| 11 #endif // defined(OS_CHROMEOS) | 12 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" |
| 13 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" | |
| 14 #endif | |
| 12 | 15 |
| 13 namespace browser { | 16 namespace browser { |
| 14 | 17 |
| 15 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, | 18 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, |
| 16 views::WidgetDelegate* delegate) { | 19 views::WidgetDelegate* delegate) { |
| 17 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 20 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 18 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL | 21 // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL |
| 19 // for crbug.com/98322 is landed. | 22 // for crbug.com/98322 is landed. |
| 20 return chromeos::BubbleWindow::Create(parent, | 23 return chromeos::BubbleWindow::Create(parent, |
| 21 STYLE_GENERIC, delegate); | 24 STYLE_GENERIC, delegate); |
| 22 #else | 25 #else |
| 23 return views::Widget::CreateWindowWithParent(delegate, parent); | 26 return views::Widget::CreateWindowWithParent(delegate, parent); |
| 24 #endif | 27 #endif |
| 25 } | 28 } |
| 26 | 29 |
| 30 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) { | |
|
Daniel Erat
2011/11/21 23:10:50
nit: one space after return type instead of two
alicet1
2011/11/22 00:23:53
Done.
| |
| 31 views::Widget* bubble_widget = | |
| 32 views::BubbleDelegateView::CreateBubble(delegate); | |
| 33 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | |
| 34 { | |
| 35 std::vector<int> params; | |
| 36 params.push_back(delegate->show_while_screen_is_locked()); | |
| 37 chromeos::WmIpc::instance()->SetWindowType( | |
| 38 bubble_widget->GetNativeView(), | |
| 39 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, | |
| 40 ¶ms); | |
| 41 } | |
| 42 #endif | |
| 43 return bubble_widget; | |
| 44 } | |
| 45 | |
| 27 } // namespace browser | 46 } // namespace browser |
| OLD | NEW |