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

ash/system/tray/system_tray.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/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 203 matching lines @@
     // Draw a line first.
     int y = owner_->height() + 1;
     canvas->FillRect(gfx::Rect(kLeftPadding, y, owner_->width(),
                                kBottomLineHeight), kBorderDarkColor);
 
     // Now, draw a shadow.
     canvas->FillRect(gfx::Rect(kLeftPadding + kShadowOffset, y,
                                owner_->width() - kShadowOffset, kShadowHeight),
                      kShadowColor);
 
-    if (Shell::GetInstance()->shelf()->IsVisible()) {
+    Shell* shell = Shell::GetInstance();
+    if (shell->shelf()->IsVisible() &&
+        !shell->tray()->GetWidget()->GetWindowScreenBounds().IsEmpty()) {

[sadrul, 2012/04/09 00:08:37]

Should 'IsVisible' check whether it has non-empty bounds?

[sky, 2012/04/09 15:11:21]

Yes, I think that's a good idea.

[sadrul, 2012/04/09 20:56:28]

Done.

       // Draw the arrow.
       int left_base_x = owner_->width() - kArrowPaddingFromRight - kArrowWidth;
       int left_base_y = y;
       int tip_x = left_base_x + kArrowWidth / 2;
       int tip_y = left_base_y + kArrowHeight;
       SkPath path;
       path.incReserve(4);
       path.moveTo(SkIntToScalar(left_base_x), SkIntToScalar(left_base_y));
       path.lineTo(SkIntToScalar(tip_x), SkIntToScalar(tip_y));
       path.lineTo(SkIntToScalar(left_base_x + kArrowWidth),
@@ skipping 109 matching lines @@
     for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
         it != items_.end();
         ++it) {
       views::View* view = detailed_ ? (*it)->CreateDetailedView(login_status) :
                                       (*it)->CreateDefaultView(login_status);
       if (view)
         AddChildView(new TrayPopupItemContainer(view));
     }
   }
 
+  virtual gfx::Rect GetAnchorRect() OVERRIDE {
+    gfx::Rect rect = tray_->GetWidget()->GetWindowScreenBounds();
+    rect.Inset(0, 0, kPaddingFromRightEdgeOfScreen, 0);
+    return rect;
+  }
+
   // Overridden from views::View.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
     state->role = ui::AccessibilityTypes::ROLE_WINDOW;
     state->name = l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
   }
 
   virtual bool CanActivate() const OVERRIDE {
     return can_activate_;
   }
@@ skipping 296 matching lines @@
       popup_->Hide();
     }
   }
   return base::EVENT_CONTINUE;
 }
 
 void SystemTray::DidProcessEvent(const base::NativeEvent& event) {
 }
 
 }  // namespace ash