Fixing various problems with the new shelf layout in conjunction with the blue tray background on b…

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/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
@@ skipping 358 matching lines @@
   message_center_bubble->SetMaxHeight(std::max(0,
                                                max_height - GetTraySpacing()));
   if (show_settings)
     message_center_bubble->SetSettingsVisible();
   message_center_bubble_.reset(
       new internal::WebNotificationBubbleWrapper(this, message_center_bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
   button_->SetBubbleVisible(true);
+  SetDrawBackgroundAsActive(true);
   return true;
 }
 
 bool WebNotificationTray::ShowMessageCenter() {
   return ShowMessageCenterInternal(false /* show_settings */);
 }
 
 void WebNotificationTray::HideMessageCenter() {
   if (!message_center_bubble())
     return;
+  SetDrawBackgroundAsActive(false);
   message_center_bubble_.reset();
   should_block_shelf_auto_hide_ = false;
   show_message_center_on_unlock_ = false;
   status_area_widget()->SetHideSystemNotifications(false);
   GetShelfLayoutManager()->UpdateAutoHideState();
   button_->SetBubbleVisible(false);
 }
 
 void WebNotificationTray::SetSystemTrayHeight(int height) {
   work_area_observer_->SetSystemTrayHeight(height);
@@ skipping 162 matching lines @@
     bool in_quiet_mode = message_center()->IsQuietMode();
     message_center()->SetQuietMode(!in_quiet_mode);
     return;
   }
   base::TimeDelta expires_in = command_id == kEnableQuietModeDay ?
       base::TimeDelta::FromDays(1):
       base::TimeDelta::FromHours(1);
   message_center()->EnterQuietModeWithExpire(expires_in);
 }
 
-bool WebNotificationTray::IsPressed() {
-  return IsMessageCenterBubbleVisible();
-}
-
 void WebNotificationTray::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   DCHECK_EQ(button_, sender);
   PerformAction(event);
 }
 
 void WebNotificationTray::OnMessageCenterTrayChanged() {
   // Do not update the tray contents directly. Multiple change events can happen
   // consecutively, and calling Update in the middle of those events will show
   // intermediate unread counts for a moment.
@@ skipping 43 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash