Panel strip refactor cleanup.

chrome/browser/ui/panels/panel.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.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.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/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/gfx/rect.h"
 
 // static
 const Extension* Panel::GetExtensionFromBrowser(Browser* browser) {
   // Find the extension. When we create a panel from an extension, the extension
   // ID is passed as the app name to the Browser.
   ExtensionService* extension_service =
       browser->GetProfile()->GetExtensionService();
   return extension_service->GetExtensionById(
       web_app::GetExtensionIdFromApplicationName(browser->app_name()), false);
 }
 
 Panel::Panel(Browser* browser, const gfx::Size& requested_size)
     : browser_(browser),
       initialized_(false),
+      has_temporary_layout_(false),
       restored_size_(requested_size),
       auto_resizable_(false),
-      expansion_state_(EXPANDED) {
+      expansion_state_(EXPANDED),
+      app_icon_visible_(true) {
 }
 
 Panel::~Panel() {
   // Invoked by native panel destructor. Do not access native_panel_ here.
 }
 
 void Panel::Initialize(const gfx::Rect& bounds) {
   DCHECK(!initialized_);
   DCHECK(!bounds.IsEmpty());
   initialized_ = true;
@@ skipping 59 matching lines @@
     return;
 
   DCHECK(min_size.width() <= max_size.width());
   DCHECK(min_size.height() <= max_size.height());
   min_size_ = min_size;
   max_size_ = max_size;
 
   ConfigureAutoResize(browser()->GetSelectedTabContents());
 }
 
+void Panel::SetAppIconVisibility(bool visible) {
+  if (app_icon_visible_ == visible)
+    return;
+  app_icon_visible_ = visible;
+  native_panel_->SetPanelAppIconVisibility(visible);
+}
+
 void Panel::SetExpansionState(ExpansionState new_state) {
   if (expansion_state_ == new_state)
     return;
   ExpansionState old_state = expansion_state_;
   expansion_state_ = new_state;
 
   manager()->OnPanelExpansionStateChanged(this, old_state);
 
   // The minimized panel should not get the focus.
   if (expansion_state_ == MINIMIZED)
     Deactivate();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
-bool Panel::ShouldBringUpTitlebar(int mouse_x, int mouse_y) const {
-  // Skip the expanded panel.
-  if (expansion_state_ == EXPANDED)
-    return false;
-
-  // If the panel is showing titlebar only, we want to keep it up when it is
-  // being dragged.
-  if (expansion_state_ == TITLE_ONLY && manager()->is_dragging_panel())
-    return true;
-
-  // We do not want to bring up other minimized panels if the mouse is over the
-  // panel that pops up the title-bar to attract attention.
-  if (native_panel_->IsDrawingAttention())
-    return false;
-
-  gfx::Rect bounds = native_panel_->GetPanelBounds();
-  return bounds.x() <= mouse_x && mouse_x <= bounds.right() &&
-         mouse_y >= bounds.y();
-}
-
 bool Panel::IsDrawingAttention() const {
   return native_panel_->IsDrawingAttention();
 }
 
 void Panel::FullScreenModeChanged(bool is_full_screen) {
   native_panel_->FullScreenModeChanged(is_full_screen);
 }
 
 void Panel::Show() {
   // Don't show panel as active if it is in overflow state.
@@ skipping 11 matching lines @@
   // Ignore any SetBounds requests since the bounds are completely controlled
   // by panel manager.
 }
 
 // Close() may be called multiple times if the browser window is not ready to
 // close on the first attempt.
 void Panel::Close() {
   native_panel_->ClosePanel();
 }
 
-void Panel::MoveOutOfOverflow() {
-  if (expansion_state_ != Panel::IN_OVERFLOW)
-    return;
-  manager()->panel_overflow_strip()->Remove(this);
-  manager()->panel_strip()->AddPanel(this);
-}
-
 void Panel::Activate() {
-  MoveOutOfOverflow();
-
   // Make sure the panel is expanded when activated programmatically,
   // so the user input does not go into collapsed window.
   SetExpansionState(Panel::EXPANDED);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
   native_panel_->DeactivatePanel();
 }
 
@@ skipping 420 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedTabContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }