Have Notifications appear over docked windows

ash/system/web_notification/ash_popup_alignment_delegate.cc

 // Copyright 2014 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/ash_popup_alignment_delegate.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 37 matching lines @@
                                                const gfx::Display& display) {
   screen_ = screen;
   work_area_ = display.work_area();
   root_window_ = ash::Shell::GetInstance()
                      ->display_controller()
                      ->GetRootWindowForDisplayId(display.id());
   UpdateShelf();
   screen->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
   if (system_tray_height_ > 0)
-    UpdateWorkArea(display, shelf_->auto_hide_state());
+    UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::SetSystemTrayHeight(int height) {
   system_tray_height_ = height;
 
   // If the shelf is shown during auto-hide state, the distance from the edge
   // should be reduced by the height of shelf's shown height.
   if (shelf_ && shelf_->visibility_state() == SHELF_AUTO_HIDE &&
       shelf_->auto_hide_state() == SHELF_AUTO_HIDE_SHOWN) {
     system_tray_height_ -= kShelfSize - ShelfLayoutManager::kAutoHideSize;
@@ skipping 58 matching lines @@
   shelf_ = ShelfLayoutManager::ForShelf(root_window_);
   if (shelf_)
     shelf_->AddObserver(this);
 }
 
 gfx::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
   return Shell::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
 }
 
-void AshPopupAlignmentDelegate::UpdateWorkArea(const gfx::Display& display,
-                                               ShelfAutoHideState new_state) {
-  work_area_ = display.work_area();
-  if (Shell::GetInstance()->display_manager()->IsInUnifiedMode()) {
-    gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInScreen(
-        shelf_->shelf_widget()->GetNativeView());
-    work_area_.Intersect(bounds);
-  }
-
-  int width = 0;
-  if (shelf_ && (shelf_->visibility_state() == SHELF_AUTO_HIDE) &&
-      new_state == SHELF_AUTO_HIDE_SHOWN) {
-    // Since the work_area is already reduced by kAutoHideSize, the inset width
-    // should be just the difference.
-    width = kShelfSize - ShelfLayoutManager::kAutoHideSize;
-  }
-  work_area_.Inset(shelf_->SelectValueForShelfAlignment(
-      gfx::Insets(0, 0, width, 0),
-      gfx::Insets(0, width, 0, 0),
-      gfx::Insets(0, 0, 0, width),
-      gfx::Insets(width, 0, 0, 0)));
-
+void AshPopupAlignmentDelegate::UpdateWorkArea() {
+  work_area_ = shelf_->non_shelf_bounds();
   DoUpdateIfPossible();
 }
 
 void AshPopupAlignmentDelegate::OnDisplayWorkAreaInsetsChanged() {
   UpdateShelf();
-  UpdateWorkArea(GetCurrentDisplay(), shelf_->auto_hide_state());
+  UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::OnAutoHideStateChanged(
     ShelfAutoHideState new_state) {
-  UpdateWorkArea(GetCurrentDisplay(), new_state);
+  UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::OnDisplayAdded(
     const gfx::Display& new_display) {
 }
 
 void AshPopupAlignmentDelegate::OnDisplayRemoved(
     const gfx::Display& old_display) {
 }
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const gfx::Display& display,
     uint32_t metrics) {
   UpdateShelf();
   if (shelf_ && GetCurrentDisplay().id() == display.id())
-    UpdateWorkArea(display, shelf_->auto_hide_state());
+    UpdateWorkArea();
 }
 
 }  // namespace ash