Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel_manager.cc

 // Copyright (c) 2012 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_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/fullscreen.h"
@@ skipping 160 matching lines @@
 }
 
 void PanelManager::Drag(int delta_x) {
   panel_strip_->Drag(delta_x);
 }
 
 void PanelManager::EndDragging(bool cancelled) {
   panel_strip_->EndDragging(cancelled);
 }
 
-void PanelManager::OnPanelExpansionStateChanged(Panel* panel) {
-  panel_strip_->OnPanelExpansionStateChanged(panel);
-  panel_overflow_strip_->OnPanelExpansionStateChanged(panel);
+void PanelManager::OnPanelLayoutStateChanged(Panel* panel,
+                                            Panel::LayoutState old_state) {

[prasadt, 2012/01/20 04:43:08]

Indentation off by a space.

[jianli, 2012/01/20 23:33:08]

Done.

+  panel_strip_->OnPanelLayoutStateChanged(panel, old_state);
+  panel_overflow_strip_->OnPanelLayoutStateChanged(panel, old_state);

[prasadt, 2012/01/20 04:43:08]

This may be cleaner if the strips just listened to the notification fired by
Panel.

[jennb, 2012/01/20 23:28:59]

Agree that this needs to be cleaned up. Not in this patch though. The registrar
may be overkill. Maybe part of the layout manager refactor. Can discuss more
f2f.

[jianli, 2012/01/20 23:33:08]

Yes, it might be. But for our usage, I think it would be simpler to notify the
strip directly, instead of incurring overhead with the notification scheme.

+}
+
+void PanelManager::OnPanelExpansionStateChanged(
+    Panel* panel, Panel::ExpansionState old_state) {
+  if (panel->layout_state() == Panel::DOCKED)
+    panel_strip_->OnPanelExpansionStateChanged(panel, old_state);

[prasadt, 2012/01/20 04:43:08]

Same comment as above. PanelStrip could just listen to the notification. The
logic would seem like it belongs in PanelStrip.

[jianli, 2012/01/20 23:33:08]

ExpansonState now solely belongs to PanelStrip. I removed this method since we
now call directly into PanelStrip for any expansion state changes. 

 }
 
 void PanelManager::OnPanelAttentionStateChanged(Panel* panel) {
-  if (panel->expansion_state() == Panel::IN_OVERFLOW)
+  if (panel->layout_state() == Panel::IN_OVERFLOW)
     panel_overflow_strip_->OnPanelAttentionStateChanged(panel);
 }
 
 void PanelManager::OnPreferredWindowSizeChanged(
     Panel* panel, const gfx::Size& preferred_window_size) {
   if (!auto_sizing_enabled_)
     return;
   panel_strip_->OnWindowSizeChanged(panel, preferred_window_size);
 }
 
@@ skipping 71 matching lines @@
   for (PanelOverflowStrip::Panels::const_iterator iter =
            panel_overflow_strip_->panels().begin();
        iter != panel_overflow_strip_->panels().end(); ++iter)
     panels.push_back(*iter);
   return panels;
 }
 
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }