Add PanelOverflowStrip to handle panel overflow.

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/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
@@ skipping 80 matching lines @@
 }
 
 bool PanelBrowserView::CanMaximize() const {
   return false;
 }
 
 void PanelBrowserView::SetBounds(const gfx::Rect& bounds) {
   SetBoundsInternal(bounds, true);
 }
 
-void PanelBrowserView::SetBoundsInternal(const gfx::Rect& bounds,
+void PanelBrowserView::SetBoundsInternal(const gfx::Rect& new_bounds,
                                          bool animate) {
-  if (bounds_ == bounds)
+  if (bounds_ == new_bounds)
     return;
-  bounds_ = bounds;
+
+  // TODO(jianli): this is just a temporary hack to check if we need to show

[jennb, 2011/12/02 21:16:58]

Could you create a crbug for this and put # here?

Long term, I'm guessing this is the API you wanted in the Panel that the
overflow and panel strip calls from AddPanel?

[jianli, 2011/12/02 23:23:46]

Bug created. Yes, I think we need to put it in native panel.

+  // or hide the panel app icon in the taskbar.
+  int panel_strip_area_left =

[jennb, 2011/12/02 21:16:58]

Isn't it easier to just do:

ShowOrHidePanelAppIcon(panel->expansion_state() != IN_OVERFLOW) ?

nit: personally, I find DoAOrB(bool) method names hard to understand. It's like
when someone asks: Do you want A or B? Yes.

[jianli, 2011/12/02 23:23:46]

I rather keep it this way since we're going to clean this up.

+      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(bounds);
+    ::BrowserView::SetBounds(new_bounds);
     return;
   }
 
   animation_start_bounds_ = GetBounds();
 
   if (!bounds_animator_.get()) {
     bounds_animator_.reset(new ui::SlideAnimation(this));
     bounds_animator_->SetSlideDuration(kSetBoundsAnimationMs);
   }
 
@@ skipping 247 matching lines @@
 
 Browser* PanelBrowserView::GetPanelBrowser() const {
   return browser();
 }
 
 void PanelBrowserView::DestroyPanelBrowser() {
   DestroyBrowser();
 }
 
 gfx::Size PanelBrowserView::IconOnlySize() const {
-  // TODO(jianli): to be implemented.
-  return gfx::Size();
+  return GetFrameView()->IconOnlySize();
 }
 
 void PanelBrowserView::EnsurePanelFullyVisible() {
-  // TODO(jianli): to be implemented.
+#if defined(OS_WIN) && !defined(USE_AURA)
+  ::SetWindowPos(GetNativeHandle(), HWND_TOP, 0, 0, 0, 0,
+                 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+#else
+  NOTIMPLEMENTED();
+#endif
 }
 
 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const {
   return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView());
 }
 
 bool PanelBrowserView::OnTitlebarMousePressed(const gfx::Point& location) {
   // |location| is in the view's coordinate system. Convert it to the screen
   // coordinate system.
   mouse_location_ = location;
   views::View::ConvertPointToScreen(this, &mouse_location_);
 
   mouse_pressed_ = true;
   mouse_pressed_time_ = base::TimeTicks::Now();
   mouse_dragging_state_ = NO_DRAGGING;
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseDragged(const gfx::Point& location) {
   if (!mouse_pressed_)
     return false;
 
+  // Dragging is not supported for overflow panel.
+  if (panel_->expansion_state() == Panel::IN_OVERFLOW)
+    return true;
+
   gfx::Point last_mouse_location = mouse_location_;
 
   // |location| is in the view's coordinate system. Convert it to the screen
   // coordinate system.
   mouse_location_ = location;
   views::View::ConvertPointToScreen(this, &mouse_location_);
 
   int delta_x = mouse_location_.x() - last_mouse_location.x();
   int delta_y = mouse_location_.y() - last_mouse_location.y();
   if (mouse_dragging_state_ == NO_DRAGGING &&
@@ skipping 20 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_->manager()->panel_overflow_strip()->Remove(panel_.get());
+    panel_->manager()->panel_strip()->AddPanel(panel_.get());
+    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.
@@ skipping 18 matching lines @@
   // 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) {
+#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)
+    style &= (~WS_EX_TOOLWINDOW);
+  else
+    style |= WS_EX_TOOLWINDOW;
+  ::SetWindowLong(native_window, GWL_EXSTYLE, style);
+  ::ShowWindow(native_window, SW_SHOWNA);
+#else
+  NOTIMPLEMENTED();
+#endif
+}
+
 // NativePanelTesting implementation.
 class NativePanelTestingWin : public NativePanelTesting {
  public:
   explicit NativePanelTestingWin(PanelBrowserView* panel_browser_view);
 
  private:
   virtual void PressLeftMouseButtonTitlebar(
       const gfx::Point& point) OVERRIDE;
   virtual void ReleaseMouseButtonTitlebar() OVERRIDE;
   virtual void DragTitlebar(int delta_x, int delta_y) OVERRIDE;
@@ skipping 69 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();
 }