Makes a gap at the top boundary of message center.

ash/system/web_notification/web_notification_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/web_notification/web_notification_tray.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
+#include "ash/system/tray/tray_constants.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_bubble_base.h"
 #include "ui/message_center/message_center_bubble.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/message_popup_bubble.h"
 #include "ui/message_center/quiet_mode_bubble.h"
@@ skipping 86 matching lines @@
 bool WebNotificationTray::ShowMessageCenter() {
   if (!ShouldShowMessageCenter())
     return false;
 
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(message_center());
 
   // TODO(mukai): move this to WebNotificationBubbleWrapper if it's safe
   // to set the height of the popup.
   int max_height = 0;
-  if (GetShelfLayoutManager()->GetAlignment() == SHELF_ALIGNMENT_BOTTOM) {
-    gfx::Rect shelf_bounds = GetShelfLayoutManager()->GetIdealBounds();
-    max_height = shelf_bounds.y();
-  } else {
-    // Assume that the bottom line of the status area widget and the bubble are
-    // aligned.
-    aura::Window* status_area_window = status_area_widget()->GetNativeWindow();
-    max_height = status_area_window->GetBoundsInRootWindow().bottom();
+  aura::Window* status_area_window = status_area_widget()->GetNativeWindow();
+  switch (GetShelfLayoutManager()->GetAlignment()) {
+    case SHELF_ALIGNMENT_BOTTOM: {
+      gfx::Rect shelf_bounds = GetShelfLayoutManager()->GetIdealBounds();
+      max_height = shelf_bounds.y();
+      break;
+    }
+    case SHELF_ALIGNMENT_TOP: {
+      aura::RootWindow* root = status_area_window->GetRootWindow();
+      max_height =
+          root->bounds().height() - status_area_window->bounds().height();
+      break;
+    }
+    case SHELF_ALIGNMENT_LEFT:
+    case SHELF_ALIGNMENT_RIGHT: {
+      // Assume that the bottom line of the status area widget and the bubble
+      // are aligned.
+      max_height = status_area_window->GetBoundsInRootWindow().bottom();
+      break;
+    }
+    default:
+      NOTREACHED();
   }
+  if (max_height > kTraySpacing)
+    max_height -= kTraySpacing;

[stevenjb, 2013/02/13 18:54:45]

We should just subtract kTraySpacing when appropriate and clamp to 0. As
written, max_height==8 -> 1, but 7 -> 7.

[Jun Mukai, 2013/02/13 19:42:27]

used std::max(0, ...)

   message_center_bubble->SetMaxHeight(max_height);
   message_center_bubble_.reset(
       new internal::WebNotificationBubbleWrapper(this, message_center_bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
   return true;
 }
 
 void WebNotificationTray::UpdateMessageCenter() {
@@ skipping 273 matching lines @@
 
 message_center::MessagePopupBubble*
 WebNotificationTray::GetPopupBubbleForTest() {
   if (!popup_bubble())
     return NULL;
   return static_cast<message_center::MessagePopupBubble*>(
       popup_bubble()->bubble());
 }
 
 }  // namespace ash