ash: Do not show the arrow in the tray bubbles when the tray isn't visible.

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 199 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);
 
-    // 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),
-                SkIntToScalar(left_base_y));
+    internal::ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
+    if (shelf->visibility_state() == internal::ShelfLayoutManager::VISIBLE ||
+        (shelf->visibility_state() == internal::ShelfLayoutManager::AUTO_HIDE &&
+         shelf->auto_hide_state() ==
+            internal::ShelfLayoutManager::AUTO_HIDE_SHOWN)) {

[sadrul, 2012/03/28 05:38:47]

Is there a better way of determining if the tray/shelf is visible?

[sky, 2012/03/28 15:31:11]

No. I'm not opposed to you adding a method is_visible that does this check.

+      // 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),
+                  SkIntToScalar(left_base_y));
 
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(kBackgroundColor);
-    canvas->sk_canvas()->drawPath(path, paint);
+      SkPaint paint;
+      paint.setStyle(SkPaint::kFill_Style);
+      paint.setColor(kBackgroundColor);
+      canvas->sk_canvas()->drawPath(path, paint);
 
-    // Now the draw the outline.
-    paint.setStyle(SkPaint::kStroke_Style);
-    paint.setColor(kBorderDarkColor);
-    canvas->sk_canvas()->drawPath(path, paint);
+      // Now the draw the outline.
+      paint.setStyle(SkPaint::kStroke_Style);
+      paint.setColor(kBorderDarkColor);
+      canvas->sk_canvas()->drawPath(path, paint);
+    }
   }
 
   virtual void GetInsets(gfx::Insets* insets) const OVERRIDE {
     insets->Set(0, 0, kArrowHeight, 0);
   }
 
   views::View* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubbleBorder);
 };
@@ skipping 409 matching lines @@
       popup_->Hide();
     }
   }
   return base::EVENT_CONTINUE;
 }
 
 void SystemTray::DidProcessEvent(const base::NativeEvent& event) {
 }
 
 }  // namespace ash