Panel strip refactor cleanup.

chrome/browser/ui/panels/panel_browser_view.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/ui/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/panel_overflow_strip.h"
-#include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/webui/task_manager_dialog.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 119 matching lines @@
 
 void PanelBrowserView::SetBounds(const gfx::Rect& bounds) {
   SetBoundsInternal(bounds, true);
 }
 
 void PanelBrowserView::SetBoundsInternal(const gfx::Rect& new_bounds,
                                          bool animate) {
   if (bounds_ == new_bounds)
     return;
 
-  // TODO(jianli): this is just a temporary hack to check if we need to show
-  // or hide the panel app icon in the taskbar. http://crbug.com/106227
-  int panel_strip_area_left =
-      panel()->manager()->panel_strip()->display_area().x();
-  bool app_icon_shown = bounds_.x() >= panel_strip_area_left;
-  bool app_icon_to_show = new_bounds.x() >= panel_strip_area_left;
-  if (app_icon_shown != app_icon_to_show)
-    ShowOrHidePanelAppIcon(app_icon_to_show);
-
   bounds_ = new_bounds;
 
   // No animation if the panel is being dragged.
   if (!animate || mouse_dragging_state_ == DRAGGING_STARTED) {
     ::BrowserView::SetBounds(new_bounds);
     return;
   }
 
   animation_start_bounds_ = GetBounds();
 
@@ skipping 349 matching lines @@
     }
 
     return EndDragging(false);
   }
 
   // If the panel drag was cancelled before the mouse is released, do not treat
   // this as a click.
   if (mouse_dragging_state_ != NO_DRAGGING)
     return true;
 
-  // If the panel is in overflow, move it to the normal strip.
-  if (panel_->expansion_state() == Panel::IN_OVERFLOW) {
-    panel_->MoveOutOfOverflow();
-    return true;
-  }
-
   // Do not minimize the panel when we just clear the attention state. This is
   // a hack to prevent the panel from being minimized when the user clicks on
   // the title-bar to clear the attention.
   if (panel_->expansion_state() == Panel::EXPANDED &&
       base::TimeTicks::Now() - attention_cleared_time_ <
       base::TimeDelta::FromMilliseconds(kSuspendMinimizeOnClickIntervalMs)) {
     return true;
   }
 
-  // Do not minimize the panel if it is long click.
+  // Ignore long clicks. Treated as a canceled click to be consistent with Mac.

[jianli, 2011/12/08 00:27:54]

cancelled?

   if (base::TimeTicks::Now() - mouse_pressed_time_ >
       base::TimeDelta::FromMilliseconds(kShortClickThresholdMs))
     return true;
 
   Panel::ExpansionState new_expansion_state =
     (panel_->expansion_state() != Panel::EXPANDED) ? Panel::EXPANDED
                                                    : Panel::MINIMIZED;
   panel_->SetExpansionState(new_expansion_state);
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseCaptureLost() {
   if (mouse_dragging_state_ == DRAGGING_STARTED)
     return EndDragging(true);
   return true;
 }
 
 bool PanelBrowserView::EndDragging(bool cancelled) {
   // Only handle clicks that started in our window.
   if (!mouse_pressed_)
     return false;
   mouse_pressed_ = false;
 
   mouse_dragging_state_ = DRAGGING_ENDED;
   panel_->manager()->EndDragging(cancelled);
   return true;
 }
 
-void PanelBrowserView::ShowOrHidePanelAppIcon(bool show) {
+void PanelBrowserView::SetPanelAppIconVisibility(bool visible) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   gfx::NativeWindow native_window = GetNativeHandle();
   ::ShowWindow(native_window, SW_HIDE);
   int style = ::GetWindowLong(native_window, GWL_EXSTYLE);
-  if (show)
+  if (visible)
     style &= (~WS_EX_TOOLWINDOW);
   else
     style |= WS_EX_TOOLWINDOW;
   ::SetWindowLong(native_window, GWL_EXSTYLE, style);
   ::ShowWindow(native_window, SW_SHOWNA);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
@@ skipping 79 matching lines @@
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }