Applied review comments from oshima for CL 7850026.

chrome/browser/chromeos/frame/panel_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/frame/panel_controller.h"
 
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 161 matching lines @@
        dragging_(false),
        client_event_handler_id_(0),
        focused_(false),
        urgent_(false) {
 }
 
 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.
-#else
   gfx::Rect title_bounds(0, 0, window_bounds.width(), kTitleHeight);
 
   title_window_ = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.transparent = true;
   params.bounds = title_bounds;
   title_window_->Init(params);

[oshima, 2011/09/19 22:31:03]

#if !defined(USE_AURA)

[Emmanuel Saint-loubert-Bié, 2011/09/19 23:26:02]

Done.

   gtk_widget_set_size_request(title_window_->GetNativeView(),
                               title_bounds.width(), title_bounds.height());
   title_ = title_window_->GetNativeView();
   title_xid_ = ui::GetX11WindowFromGtkWidget(title_);
 
   WmIpc::instance()->SetWindowType(
       title_,
       WM_IPC_WINDOW_CHROME_PANEL_TITLEBAR,
       NULL);
   std::vector<int> type_params;
   type_params.push_back(title_xid_);
   type_params.push_back(expanded_ ? 1 : 0);
   type_params.push_back(initial_focus ? 1 : 0);
   type_params.push_back(creator_xid);
   type_params.push_back(resize_type);
   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(panel_),
       WM_IPC_WINDOW_CHROME_PANEL_CONTENT,
       &type_params);
 
   client_event_handler_id_ = g_signal_connect(
       panel_, "client-event", G_CALLBACK(OnPanelClientEvent), this);
 

[oshima, 2011/09/19 22:31:03]

#end

exclude OnPanelClientEvent for AURA.

[Emmanuel Saint-loubert-Bié, 2011/09/19 23:26:02]

Done.

   title_content_ = new TitleContentView(this);
   title_window_->SetContentsView(title_content_);
   UpdateTitleBar();
   title_window_->Show();
-#endif
 }
 
 void PanelController::UpdateTitleBar() {
   if (!delegate_ || !title_window_)
     return;
   title_content_->title_label()->SetText(
       UTF16ToWideHack(delegate_->GetPanelTitle()));
   title_content_->title_icon()->SetImage(delegate_->GetPanelIcon());
 }
 
@@ skipping 30 matching lines @@
   // titlebar window.  See WM_IPC_MESSAGE_WM_NOTIFY_PANEL_DRAGGED's declaration
   // for details.
   gint title_width = 1;
   gtk_window_get_size(GTK_WINDOW(title_), &title_width, NULL);
 
   mouse_down_ = true;
   mouse_down_offset_x_ = event.x() - title_width;
   mouse_down_offset_y_ = event.y();
   dragging_ = false;
 
-#if !defined(TOUCH_UI) && !defined(USE_AURA)
+#if !defined(TOUCH_UI)

[oshima, 2011/09/19 22:31:03]

USE_ONLY_PURE_VIEWS (or TOOLKIT_USES_GTK after sadrul's change)

   const GdkEvent* gdk_event = event.native_event();
   GdkEventButton last_button_event = gdk_event->button;
   mouse_down_abs_x_ = last_button_event.x_root;
   mouse_down_abs_y_ = last_button_event.y_root;
 #else
   const XEvent* xev = event.native_event_2();
   gfx::Point abs_location = RootLocationFromXEvent(xev);
   mouse_down_abs_x_ = abs_location.x();
   mouse_down_abs_y_ = abs_location.y();
 #endif
@@ skipping 231 matching lines @@
     views::Button* sender, const views::Event& event) {
   if (panel_controller_ && sender == close_button_)
     panel_controller_->OnCloseButtonPressed();
 }
 
 PanelController::TitleContentView::~TitleContentView() {
   VLOG(1) << "panel: delete " << this;
 }
 
 }  // namespace chromeos