Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

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"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 147 matching lines @@
 void PanelController::UpdateTitleBar() {
   if (!delegate_ || !title_window_)
     return;
   DCHECK(title_content_);
   title_content_->title_label()->SetText(
       UTF16ToWideHack(delegate_->GetPanelTitle()));
   title_content_->title_icon()->SetImage(delegate_->GetPanelIcon());
 }
 
 bool PanelController::TitleMousePressed(const views::MouseEvent& event) {
-  if (!event.IsOnlyLeftMouseButton()) {
+  if (!event.IsOnlyLeftMouseButton())
     return false;
-  }
   GdkEvent* gdk_event = gtk_get_current_event();
   if (gdk_event->type != GDK_BUTTON_PRESS) {
     gdk_event_free(gdk_event);
     NOTREACHED();
     return false;
   }
   DCHECK(title_);
   // Get the last titlebar width that we saw in a ConfigureNotify event -- we
   // need to give drag positions in terms of the top-right corner of the
   // 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);
 
   GdkEventButton last_button_event = gdk_event->button;
   mouse_down_ = true;
   mouse_down_abs_x_ = last_button_event.x_root;
   mouse_down_abs_y_ = last_button_event.y_root;
   mouse_down_offset_x_ = event.x() - title_width;
   mouse_down_offset_y_ = event.y();
   dragging_ = false;
   gdk_event_free(gdk_event);
   return true;
 }
 
-void PanelController::TitleMouseReleased(
-    const views::MouseEvent& event, bool canceled) {
-  if (!event.IsLeftMouseButton()) {
-    return;
-  }
-  // Only handle clicks that started in our window.
-  if (!mouse_down_) {
-    return;
-  }
-
-  mouse_down_ = false;
-  if (!dragging_) {
-    SetState(expanded_ ?
-             PanelController::MINIMIZED : PanelController::EXPANDED);
-  } else {
-    WmIpc::Message msg(WM_IPC_MESSAGE_WM_NOTIFY_PANEL_DRAG_COMPLETE);
-    msg.set_param(0, panel_xid_);
-    WmIpc::instance()->SendMessage(msg);
-    dragging_ = false;
-  }
-}
-
-void PanelController::SetState(State state) {
-  WmIpc::Message msg(WM_IPC_MESSAGE_WM_SET_PANEL_STATE);
-  msg.set_param(0, panel_xid_);
-  msg.set_param(1, state == EXPANDED);
-  WmIpc::instance()->SendMessage(msg);
-}
-
 bool PanelController::TitleMouseDragged(const views::MouseEvent& event) {
-  if (!mouse_down_) {
+  if (!mouse_down_)
     return false;
-  }
-
   GdkEvent* gdk_event = gtk_get_current_event();
   if (gdk_event->type != GDK_MOTION_NOTIFY) {
     gdk_event_free(gdk_event);
     NOTREACHED();
     return false;
   }
   GdkEventMotion last_motion_event = gdk_event->motion;
   if (!dragging_) {
     if (views::View::ExceededDragThreshold(
         last_motion_event.x_root - mouse_down_abs_x_,
         last_motion_event.y_root - mouse_down_abs_y_)) {
       dragging_ = true;
     }
   }
   if (dragging_) {
     WmIpc::Message msg(WM_IPC_MESSAGE_WM_NOTIFY_PANEL_DRAGGED);
     msg.set_param(0, panel_xid_);
     msg.set_param(1, last_motion_event.x_root - mouse_down_offset_x_);
     msg.set_param(2, last_motion_event.y_root - mouse_down_offset_y_);
     WmIpc::instance()->SendMessage(msg);
   }
   gdk_event_free(gdk_event);
   return true;
 }
 
+void PanelController::TitleMouseReleased(const views::MouseEvent& event) {
+  if (event.IsLeftMouseButton())
+    TitleMouseCaptureLost();
+}
+
+void PanelController::TitleMouseCaptureLost() {
+  // Only handle clicks that started in our window.
+  if (!mouse_down_)
+    return;
+
+  mouse_down_ = false;
+  if (!dragging_) {
+    SetState(expanded_ ?
+             PanelController::MINIMIZED : PanelController::EXPANDED);
+  } else {
+    WmIpc::Message msg(WM_IPC_MESSAGE_WM_NOTIFY_PANEL_DRAG_COMPLETE);
+    msg.set_param(0, panel_xid_);
+    WmIpc::instance()->SendMessage(msg);
+    dragging_ = false;
+  }
+}
+
+void PanelController::SetState(State state) {
+  WmIpc::Message msg(WM_IPC_MESSAGE_WM_SET_PANEL_STATE);
+  msg.set_param(0, panel_xid_);
+  msg.set_param(1, state == EXPANDED);
+  WmIpc::instance()->SendMessage(msg);
+}
+
 // static
 bool PanelController::OnPanelClientEvent(
     GtkWidget* widget,
     GdkEventClient* event,
     PanelController* panel_controller) {
   return panel_controller->PanelClientEvent(event);
 }
 
 void PanelController::OnFocusIn() {
   if (title_window_)
@@ skipping 67 matching lines @@
   title_label_ = new views::Label(std::wstring());
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(title_label_);
 
   set_background(
       views::Background::CreateBackgroundPainter(
           true, new TitleBackgroundPainter()));
   OnFocusOut();
 }
 
+void PanelController::TitleContentView::OnFocusIn() {
+  title_label_->SetColor(kTitleActiveColor);
+  title_label_->SetFont(*active_font);
+  Layout();
+  SchedulePaint();
+}
+
+void PanelController::TitleContentView::OnFocusOut() {
+  title_label_->SetColor(kTitleInactiveColor);
+  title_label_->SetFont(*inactive_font);
+  Layout();
+  SchedulePaint();
+}
+
+void PanelController::TitleContentView::OnClose() {
+  panel_controller_ = NULL;
+}
+
 void PanelController::TitleContentView::Layout() {
   int close_button_x = bounds().width() -
       (close_button_width + kTitleCloseButtonPad);
   close_button_->SetBounds(
       close_button_x,
       (bounds().height() - close_button_height) / 2,
       close_button_width,
       close_button_height);
   title_icon_->SetBounds(
       kTitleWidthPad,
       kTitleHeightPad,
       kTitleIconSize,
       kTitleIconSize);
   int title_x = kTitleWidthPad * 2 + kTitleIconSize;
   title_label_->SetBounds(
       title_x,
       0,
       close_button_x - (title_x + kTitleCloseButtonPad),
       bounds().height());
 }
 
 bool PanelController::TitleContentView::OnMousePressed(
     const views::MouseEvent& event) {
   DCHECK(panel_controller_) << "OnMousePressed after Close";
   return panel_controller_->TitleMousePressed(event);
 }
 
-void PanelController::TitleContentView::OnMouseReleased(
-    const views::MouseEvent& event, bool canceled) {
-  DCHECK(panel_controller_) << "MouseReleased after Close";
-  return panel_controller_->TitleMouseReleased(event, canceled);
-}
-
 bool PanelController::TitleContentView::OnMouseDragged(
     const views::MouseEvent& event) {
   DCHECK(panel_controller_) << "MouseDragged after Close";
   return panel_controller_->TitleMouseDragged(event);
 }
 
-void PanelController::TitleContentView::OnFocusIn() {
-  title_label_->SetColor(kTitleActiveColor);
-  title_label_->SetFont(*active_font);
-  Layout();
-  SchedulePaint();
+void PanelController::TitleContentView::OnMouseReleased(
+    const views::MouseEvent& event) {
+  DCHECK(panel_controller_) << "MouseReleased after Close";
+  return panel_controller_->TitleMouseReleased(event);
 }
 
-void PanelController::TitleContentView::OnFocusOut() {
-  title_label_->SetColor(kTitleInactiveColor);
-  title_label_->SetFont(*inactive_font);
-  Layout();
-  SchedulePaint();
-}
-
-void PanelController::TitleContentView::OnClose() {
-  panel_controller_ = NULL;
+void PanelController::TitleContentView::OnMouseCaptureLost() {
+  DCHECK(panel_controller_) << "OnMouseCaptureLost after Close";

[Ben Goodger (Google), 2011/03/19 15:32:55]

These kind of DCHECKs are unnecessary. You're going to crash on the next line
anyway if panel_controller_ is NULL.

[msw, 2011/03/26 00:09:50]

Done. Fixed this file and double-checked my other changes.

+  return panel_controller_->TitleMouseCaptureLost();
 }
 
 void PanelController::TitleContentView::ButtonPressed(
     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