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

Unified Diff: chrome/browser/chromeos/frame/bubble_window.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 years, 3 months 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
Index: chrome/browser/chromeos/frame/bubble_window.cc
diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window.cc
index 8c79f790b881b1c32caae05342df4babdef313f6..070a7b9bc283e06c762534019f71c1f62baabd84 100644
--- a/chrome/browser/chromeos/frame/bubble_window.cc
+++ b/chrome/browser/chromeos/frame/bubble_window.cc
@@ -20,6 +20,9 @@ BubbleWindow::BubbleWindow(views::Widget* window,
}
void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) {
+#if defined(USE_AURA)
+ // TODO(saintlou): Switch to alicet@chromium.org PureView when landed
+#else
views::NativeWidgetGtk::InitNativeWidget(params);
// Turn on double buffering so that the hosted GtkWidgets does not
@@ -39,6 +42,7 @@ void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) {
gdk_window_set_back_pixmap(GetNativeView()->window, NULL, FALSE);
gtk_widget_realize(window_contents());
gdk_window_set_back_pixmap(window_contents()->window, NULL, FALSE);
+#endif
}
views::NonClientFrameView* BubbleWindow::CreateNonClientFrameView() {
@@ -50,6 +54,10 @@ views::Widget* BubbleWindow::Create(
gfx::NativeWindow parent,
BubbleWindowStyle style,
views::WidgetDelegate* widget_delegate) {
+#if defined(USE_AURA)
+ // TODO(saintlou):
+ return NULL;
+#else
// TODO(saintlou): Ultimately we do not want 2 classes for BubbleWindows.
// Furthermore the 2 other styles (STYLE_XBAR & STYLE_THROBBER) are only used
// in LoginHtmlDialog::Show() which will be deprecated soon.
@@ -78,6 +86,7 @@ views::Widget* BubbleWindow::Create(
window->Init(params);
return window;
+#endif
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698