Revert 144930 - Polish launcher tooltip visibility.

Add ShelfLayoutManager::Observer for two cases:
- AutoHide: catches the auto hiding status to close the tooltip property
- FullScreen: catches the shelf visibility changes to close it too

Check the visibility of Shelf itself in case of tooltip showing.  Then the toolip
won't show if the shelf is hidden.

R=derat@chromium.org,davemoore@chromium.org
BUG=133551
TEST=manually done on lumpy, made sure aura_shell_unittests passed

Review URL: https://chromiumcodereview.appspot.com/10700030

TBR=mukai@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10701042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144934 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 15 deletions

diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index cf0c624..156fad1 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -279,8 +279,6 @@ void ShelfLayoutManager::UpdateAutoHideState() {
     if (auto_hide_state == AUTO_HIDE_HIDDEN) {
       // Hides happen immediately.
       SetState(state_.visibility_state);
-      FOR_EACH_OBSERVER(Observer, observers_,
-                        OnAutoHideStateChanged(auto_hide_state));
     } else {
       auto_hide_timer_.Stop();
       auto_hide_timer_.Start(
@@ -298,14 +296,6 @@ void ShelfLayoutManager::SetWindowOverlapsShelf(bool value) {
   UpdateShelfBackground(internal::BackgroundAnimator::CHANGE_ANIMATE);
 }
 
-void ShelfLayoutManager::AddObserver(Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void ShelfLayoutManager::RemoveObserver(Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, aura::LayoutManager implementation:
 
@@ -355,9 +345,6 @@ void ShelfLayoutManager::SetState(VisibilityState visibility_state) {
   if (state_.Equals(state))
     return;  // Nothing changed.
 
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    WillVisibilityStateChange(visibility_state));
-
   if (state.visibility_state == AUTO_HIDE) {
     // When state is AUTO_HIDE we need to track when the mouse is over the
     // launcher to unhide the shelf. AutoHideEventFilter does that for us.
@@ -520,8 +507,6 @@ bool ShelfLayoutManager::GetLauncherPaintsBackground() const {
 
 void ShelfLayoutManager::UpdateAutoHideStateNow() {
   SetState(state_.visibility_state);
-  FOR_EACH_OBSERVER(Observer, observers_, OnAutoHideStateChanged(
-      CalculateAutoHideState(state_.visibility_state)));
 }
 
 ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(