ash: Make sure the uber-tray popup is positioned correctly.

ash/wm/shelf_layout_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 "ash/wm/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 111 matching lines @@
 }
 
 void ShelfLayoutManager::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
   if (auto_hide_behavior_ == behavior)
     return;
   auto_hide_behavior_ = behavior;
   UpdateVisibilityState();
 }
 
 bool ShelfLayoutManager::IsVisible() const {
-  return state_.visibility_state == VISIBLE ||
+  bool empty = status_->GetWindowScreenBounds().IsEmpty() &&

[sky, 2012/04/09 21:01:48]

Can we use status_->IsVisible() instead? Also, I think checking one should be
enough.

[sadrul, 2012/04/09 23:59:34]

Changed to use status_->IsVisible. I have removed the check for launcher-widget,
but I believe the call to GetStatusWidth is still necessary?

+               (launcher_widget()->GetWindowScreenBounds().IsEmpty() ||
+                launcher_->GetStatusWidth() == 0);
+  return !empty && (state_.visibility_state == VISIBLE ||
       (state_.visibility_state == AUTO_HIDE &&
-       state_.auto_hide_state == AUTO_HIDE_SHOWN);
+       state_.auto_hide_state == AUTO_HIDE_SHOWN));
 }
 
 gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds(
     aura::Window* window) const {
   // TODO: needs to be multi-mon aware.
   gfx::Rect bounds(gfx::Screen::GetMonitorAreaNearestWindow(window));
   if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT ||
       auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
     bounds.set_height(bounds.height() - kAutoHideHeight);
     return bounds;
@@ skipping 283 matching lines @@
     insets.Set(kWorkspaceAreaBottomInset, 0, 0, 0);
   }
   if (launcher_widget() && launcher_widget()->GetNativeWindow())
     launcher_widget()->GetNativeWindow()->set_hit_test_bounds_override_outer(
         insets);
   status_->GetNativeWindow()->set_hit_test_bounds_override_outer(insets);
 }
 
 }  // namespace internal
 }  // namespace ash