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

Unified Diff: chrome/browser/chromeos/frame/panel_controller.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/panel_controller.cc
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 9a1c001647f729e2a3312faf704668b485100331..1f9d97f6464d23581493b57ad4fc86e062d9de50 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -179,6 +179,9 @@ void PanelController::Init(bool initial_focus,
const gfx::Rect& window_bounds,
XID creator_xid,
WmIpcPanelUserResizeType resize_type) {
+#if defined(USE_AURA)
+ // TODO(saintlou): Need PureView for panels.
oshima 2011/09/19 15:52:39 You can just skip gtk/WM stuff for now. The result
Emmanuel Saint-loubert-Bié 2011/09/19 20:15:36 Done.
+#else
gfx::Rect title_bounds(0, 0, window_bounds.width(), kTitleHeight);
title_window_ = new views::Widget;
@@ -214,6 +217,7 @@ void PanelController::Init(bool initial_focus,
title_window_->SetContentsView(title_content_);
UpdateTitleBar();
title_window_->Show();
+#endif
}
void PanelController::UpdateTitleBar() {
@@ -264,7 +268,7 @@ bool PanelController::TitleMousePressed(const views::MouseEvent& event) {
mouse_down_offset_y_ = event.y();
dragging_ = false;
-#if !defined(TOUCH_UI)
+#if !defined(TOUCH_UI) && !defined(USE_AURA)
const GdkEvent* gdk_event = event.native_event();
GdkEventButton last_button_event = gdk_event->button;
mouse_down_abs_x_ = last_button_event.x_root;

Powered by Google App Engine
This is Rietveld 408576698