Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1078)

Unified Diff: chrome/browser/ui/views/window.cc

Issue 8604012: move chromeos bubble setup code to window.cc (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: update with content settings bubble also. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/views/window.h ('K') | « chrome/browser/ui/views/window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/window.cc
diff --git a/chrome/browser/ui/views/window.cc b/chrome/browser/ui/views/window.cc
index 9b13c0fe2d03ddd2aa543bf9b77474ab116f6cac..f5509ef5784a14a320ec0325b7046af5bcacaddb 100644
--- a/chrome/browser/ui/views/window.cc
+++ b/chrome/browser/ui/views/window.cc
@@ -4,11 +4,14 @@
#include "chrome/browser/ui/views/window.h"
+#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/widget/widget.h"
#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
#include "chrome/browser/chromeos/frame/bubble_window.h"
-#endif // defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
+#include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
+#endif
namespace browser {
@@ -24,4 +27,35 @@ views::Widget* CreateViewsWindow(gfx::NativeWindow parent,
#endif
}
+views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) {
+ views::Widget* bubble_widget =
+ views::BubbleDelegateView::CreateBubble(delegate);
+#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
+ {
+ std::vector<int> params;
+ params.push_back(0); // Do not show when screen is locked.
+ chromeos::WmIpc::instance()->SetWindowType(
+ bubble_widget->GetNativeView(),
+ chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
+ &params);
+ }
+#endif
+ return bubble_widget;
+}
+
+views::Widget* CreatePersistentViewsBubble(
+ views::BubbleDelegateView* delegate) {
+ views::Widget* bubble_widget =
+ views::BubbleDelegateView::CreateBubble(delegate);
+#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
+ std::vector<int> params;
+ params.push_back(1); // Show while screen is locked.
+ chromeos::WmIpc::instance()->SetWindowType(
+ bubble_widget->GetNativeView(),
+ chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
+ &params);
+#endif
+ return bubble_widget;
+}
+
} // namespace browser
« chrome/browser/ui/views/window.h ('K') | « chrome/browser/ui/views/window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698