| 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/window.h" | 5 #include "chrome/browser/ui/views/window.h" |
| 6 | 6 |
| 7 #include "ui/views/bubble/bubble_delegate.h" | 7 #include "ui/views/bubble/bubble_delegate.h" |
| 8 #include "ui/views/widget/widget.h" | 8 #include "ui/views/widget/widget.h" |
| 9 | 9 |
| 10 #if defined(USE_AURA) | 10 #if defined(USE_AURA) |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, | 38 views::Widget* CreateViewsWindow(gfx::NativeWindow parent, |
| 39 views::WidgetDelegate* delegate, | 39 views::WidgetDelegate* delegate, |
| 40 DialogStyle style) { | 40 DialogStyle style) { |
| 41 #if defined(OS_CHROMEOS) && !defined(USE_AURA) | 41 #if defined(OS_CHROMEOS) && !defined(USE_AURA) |
| 42 return chromeos::BubbleWindow::Create(parent, style, delegate); | 42 return chromeos::BubbleWindow::Create(parent, style, delegate); |
| 43 #else | 43 #else |
| 44 return views::Widget::CreateWindowWithParent(delegate, parent); | 44 return views::Widget::CreateWindowWithParent(delegate, parent); |
| 45 #endif | 45 #endif |
| 46 } | 46 } |
| 47 | 47 |
| 48 views::Widget* CreateFramelessViewsWindow(gfx::NativeWindow parent, |
| 49 views::WidgetDelegate* delegate) { |
| 50 #if defined(OS_CHROMEOS) && !defined(USE_AURA) |
| 51 return chromeos::BubbleWindow::Create(parent, STYLE_FLUSH, delegate); |
| 52 #else |
| 53 return views::Widget::CreateFramelessWindowWithParentAndBounds(delegate, |
| 54 parent, gfx::Rect()); |
| 55 #endif |
| 56 } |
| 57 |
| 48 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) { | 58 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) { |
| 49 views::Widget* bubble_widget = | 59 views::Widget* bubble_widget = |
| 50 views::BubbleDelegateView::CreateBubble(delegate); | 60 views::BubbleDelegateView::CreateBubble(delegate); |
| 51 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) | 61 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 52 { | 62 { |
| 53 std::vector<int> params; | 63 std::vector<int> params; |
| 54 params.push_back(0); // Do not show when screen is locked. | 64 params.push_back(0); // Do not show when screen is locked. |
| 55 chromeos::WmIpc::instance()->SetWindowType( | 65 chromeos::WmIpc::instance()->SetWindowType( |
| 56 bubble_widget->GetNativeView(), | 66 bubble_widget->GetNativeView(), |
| 57 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, | 67 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 75 params.push_back(1); // Show while screen is locked. | 85 params.push_back(1); // Show while screen is locked. |
| 76 chromeos::WmIpc::instance()->SetWindowType( | 86 chromeos::WmIpc::instance()->SetWindowType( |
| 77 bubble_widget->GetNativeView(), | 87 bubble_widget->GetNativeView(), |
| 78 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, | 88 chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, |
| 79 ¶ms); | 89 ¶ms); |
| 80 #endif | 90 #endif |
| 81 return bubble_widget; | 91 return bubble_widget; |
| 82 } | 92 } |
| 83 | 93 |
| 84 } // namespace browser | 94 } // namespace browser |
| OLD | NEW |